diff options
author | tilosp-bot <git-bot@tilosp.de> | 2020-04-16 19:24:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-16 17:24:34 +0000 |
commit | 546813d73fc501b558561934b6102caad3595edd (patch) | |
tree | fe4f5818724440ab49a2cbad815ebfb084224558 /17.0-rc/apache/config | |
parent | 9d807aa7ad922db546d389b672cc2344d32a6dd6 (diff) |
Run update.sh (#1078)19.0.0beta4-fpm-alpine19.0.0beta4-fpm19.0.0beta4-apache19.0.0beta418.0.4RC1-fpm-alpine18.0.4RC1-fpm18.0.4RC1-apache18.0.4RC118.0.4-rc-fpm-alpine18.0.4-rc-fpm18.0.4-rc-apache18.0.4-rc18.0-rc-fpm-alpine18.0-rc-fpm18.0-rc-apache18.0-rc18-rc-fpm-alpine18-rc-fpm18-rc-apache18-rc17.0.6RC1-fpm-alpine17.0.6RC1-fpm17.0.6RC1-apache17.0.6RC117.0.6-rc-fpm-alpine17.0.6-rc-fpm17.0.6-rc-apache17.0.6-rc17.0-rc-fpm-alpine17.0-rc-fpm17.0-rc-apache17.0-rc17-rc-fpm-alpine17-rc-fpm17-rc-apache17-rc16.0.10RC1-fpm-alpine16.0.10RC1-fpm16.0.10RC1-apache16.0.10RC116.0.10-rc-fpm-alpine16.0.10-rc-fpm16.0.10-rc-apache16.0.10-rc16.0-rc-fpm-alpine16.0-rc-fpm16.0-rc-apache16.0-rc16-rc-fpm-alpine16-rc-fpm16-rc-apache16-rc
Signed-off-by: tilosp-bot <git-bot@tilosp.de>
Diffstat (limited to '17.0-rc/apache/config')
-rw-r--r-- | 17.0-rc/apache/config/apache-pretty-urls.config.php | 4 | ||||
-rw-r--r-- | 17.0-rc/apache/config/apcu.config.php | 4 | ||||
-rw-r--r-- | 17.0-rc/apache/config/apps.config.php | 15 | ||||
-rw-r--r-- | 17.0-rc/apache/config/autoconfig.php | 31 | ||||
-rw-r--r-- | 17.0-rc/apache/config/redis.config.php | 17 | ||||
-rw-r--r-- | 17.0-rc/apache/config/reverse-proxy.config.php | 25 | ||||
-rw-r--r-- | 17.0-rc/apache/config/smtp.config.php | 15 |
7 files changed, 111 insertions, 0 deletions
diff --git a/17.0-rc/apache/config/apache-pretty-urls.config.php b/17.0-rc/apache/config/apache-pretty-urls.config.php new file mode 100644 index 00000000..72da1d8c --- /dev/null +++ b/17.0-rc/apache/config/apache-pretty-urls.config.php @@ -0,0 +1,4 @@ +<?php +$CONFIG = array ( + 'htaccess.RewriteBase' => '/', +); diff --git a/17.0-rc/apache/config/apcu.config.php b/17.0-rc/apache/config/apcu.config.php new file mode 100644 index 00000000..69fed876 --- /dev/null +++ b/17.0-rc/apache/config/apcu.config.php @@ -0,0 +1,4 @@ +<?php +$CONFIG = array ( + 'memcache.local' => '\OC\Memcache\APCu', +); diff --git a/17.0-rc/apache/config/apps.config.php b/17.0-rc/apache/config/apps.config.php new file mode 100644 index 00000000..a4bed833 --- /dev/null +++ b/17.0-rc/apache/config/apps.config.php @@ -0,0 +1,15 @@ +<?php +$CONFIG = array ( + "apps_paths" => array ( + 0 => array ( + "path" => OC::$SERVERROOT."/apps", + "url" => "/apps", + "writable" => false, + ), + 1 => array ( + "path" => OC::$SERVERROOT."/custom_apps", + "url" => "/custom_apps", + "writable" => true, + ), + ), +); diff --git a/17.0-rc/apache/config/autoconfig.php b/17.0-rc/apache/config/autoconfig.php new file mode 100644 index 00000000..deeabe4e --- /dev/null +++ b/17.0-rc/apache/config/autoconfig.php @@ -0,0 +1,31 @@ +<?php + +$autoconfig_enabled = false; + +if (getenv('SQLITE_DATABASE')) { + $AUTOCONFIG["dbtype"] = "sqlite"; + $AUTOCONFIG["dbname"] = getenv('SQLITE_DATABASE'); + $autoconfig_enabled = true; +} elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) { + $AUTOCONFIG["dbtype"] = "mysql"; + $AUTOCONFIG["dbname"] = getenv('MYSQL_DATABASE'); + $AUTOCONFIG["dbuser"] = getenv('MYSQL_USER'); + $AUTOCONFIG["dbpass"] = getenv('MYSQL_PASSWORD'); + $AUTOCONFIG["dbhost"] = getenv('MYSQL_HOST'); + $autoconfig_enabled = true; +} elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) { + $AUTOCONFIG["dbtype"] = "pgsql"; + $AUTOCONFIG["dbname"] = getenv('POSTGRES_DB'); + $AUTOCONFIG["dbuser"] = getenv('POSTGRES_USER'); + $AUTOCONFIG["dbpass"] = getenv('POSTGRES_PASSWORD'); + $AUTOCONFIG["dbhost"] = getenv('POSTGRES_HOST'); + $autoconfig_enabled = true; +} + +if ($autoconfig_enabled) { + if (getenv('NEXTCLOUD_TABLE_PREFIX')) { + $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX'); + } + + $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; +} diff --git a/17.0-rc/apache/config/redis.config.php b/17.0-rc/apache/config/redis.config.php new file mode 100644 index 00000000..9429c901 --- /dev/null +++ b/17.0-rc/apache/config/redis.config.php @@ -0,0 +1,17 @@ +<?php +if (getenv('REDIS_HOST')) { + $CONFIG = array ( + 'memcache.distributed' => '\OC\Memcache\Redis', + 'memcache.locking' => '\OC\Memcache\Redis', + 'redis' => array( + 'host' => getenv('REDIS_HOST'), + 'password' => getenv('REDIS_HOST_PASSWORD'), + ), + ); + + if (getenv('REDIS_HOST_PORT') !== false) { + $CONFIG['redis']['port'] = (int) getenv('REDIS_HOST_PORT'); + } elseif (getenv('REDIS_HOST')[0] != '/') { + $CONFIG['redis']['port'] = 6379; + } +} diff --git a/17.0-rc/apache/config/reverse-proxy.config.php b/17.0-rc/apache/config/reverse-proxy.config.php new file mode 100644 index 00000000..667be312 --- /dev/null +++ b/17.0-rc/apache/config/reverse-proxy.config.php @@ -0,0 +1,25 @@ +<?php +$overwriteHost = getenv('OVERWRITEHOST'); +if ($overwriteHost) { + $CONFIG['overwritehost'] = $overwriteHost; +} + +$overwriteProtocol = getenv('OVERWRITEPROTOCOL'); +if ($overwriteProtocol) { + $CONFIG['overwriteprotocol'] = $overwriteProtocol; +} + +$overwriteWebRoot = getenv('OVERWRITEWEBROOT'); +if ($overwriteWebRoot) { + $CONFIG['overwritewebroot'] = $overwriteWebRoot; +} + +$overwriteCondAddr = getenv('OVERWRITECONDADDR'); +if ($overwriteCondAddr) { + $CONFIG['overwritecondaddr'] = $overwriteCondAddr; +} + +$trustedProxies = getenv('TRUSTED_PROXIES'); +if ($trustedProxies) { + $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies))); +} diff --git a/17.0-rc/apache/config/smtp.config.php b/17.0-rc/apache/config/smtp.config.php new file mode 100644 index 00000000..59f1eaa1 --- /dev/null +++ b/17.0-rc/apache/config/smtp.config.php @@ -0,0 +1,15 @@ +<?php +if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) { + $CONFIG = array ( + 'mail_smtpmode' => 'smtp', + 'mail_smtphost' => getenv('SMTP_HOST'), + 'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25), + 'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '', + 'mail_smtpauth' => getenv('SMTP_NAME') && getenv('SMTP_PASSWORD'), + 'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN', + 'mail_smtpname' => getenv('SMTP_NAME') ?: '', + 'mail_smtppassword' => getenv('SMTP_PASSWORD') ?: '', + 'mail_from_address' => getenv('MAIL_FROM_ADDRESS'), + 'mail_domain' => getenv('MAIL_DOMAIN'), + ); +} |