diff options
Diffstat (limited to '18.0-rc/apache/config')
-rw-r--r-- | 18.0-rc/apache/config/apache-pretty-urls.config.php | 4 | ||||
-rw-r--r-- | 18.0-rc/apache/config/apcu.config.php | 4 | ||||
-rw-r--r-- | 18.0-rc/apache/config/apps.config.php | 15 | ||||
-rw-r--r-- | 18.0-rc/apache/config/autoconfig.php | 27 | ||||
-rw-r--r-- | 18.0-rc/apache/config/redis.config.php | 17 | ||||
-rw-r--r-- | 18.0-rc/apache/config/reverse-proxy.config.php | 25 | ||||
-rw-r--r-- | 18.0-rc/apache/config/s3.config.php | 21 | ||||
-rw-r--r-- | 18.0-rc/apache/config/smtp.config.php | 15 | ||||
-rw-r--r-- | 18.0-rc/apache/config/swift.config.php | 31 |
9 files changed, 0 insertions, 159 deletions
diff --git a/18.0-rc/apache/config/apache-pretty-urls.config.php b/18.0-rc/apache/config/apache-pretty-urls.config.php deleted file mode 100644 index 72da1d8c..00000000 --- a/18.0-rc/apache/config/apache-pretty-urls.config.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$CONFIG = array ( - 'htaccess.RewriteBase' => '/', -); diff --git a/18.0-rc/apache/config/apcu.config.php b/18.0-rc/apache/config/apcu.config.php deleted file mode 100644 index 69fed876..00000000 --- a/18.0-rc/apache/config/apcu.config.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php -$CONFIG = array ( - 'memcache.local' => '\OC\Memcache\APCu', -); diff --git a/18.0-rc/apache/config/apps.config.php b/18.0-rc/apache/config/apps.config.php deleted file mode 100644 index a4bed833..00000000 --- a/18.0-rc/apache/config/apps.config.php +++ /dev/null @@ -1,15 +0,0 @@ -<?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/18.0-rc/apache/config/autoconfig.php b/18.0-rc/apache/config/autoconfig.php deleted file mode 100644 index 5bb85d42..00000000 --- a/18.0-rc/apache/config/autoconfig.php +++ /dev/null @@ -1,27 +0,0 @@ -<?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) { - $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data"; -} diff --git a/18.0-rc/apache/config/redis.config.php b/18.0-rc/apache/config/redis.config.php deleted file mode 100644 index a5fde3c7..00000000 --- a/18.0-rc/apache/config/redis.config.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php -if (getenv('REDIS_HOST')) { - $CONFIG = array( - 'memcache.distributed' => '\OC\Memcache\Redis', - 'memcache.locking' => '\OC\Memcache\Redis', - 'redis' => array( - 'host' => getenv('REDIS_HOST'), - 'password' => (string) 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/18.0-rc/apache/config/reverse-proxy.config.php b/18.0-rc/apache/config/reverse-proxy.config.php deleted file mode 100644 index 667be312..00000000 --- a/18.0-rc/apache/config/reverse-proxy.config.php +++ /dev/null @@ -1,25 +0,0 @@ -<?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/18.0-rc/apache/config/s3.config.php b/18.0-rc/apache/config/s3.config.php deleted file mode 100644 index 6376d8f6..00000000 --- a/18.0-rc/apache/config/s3.config.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php -if (getenv('OBJECTSTORE_S3_BUCKET')) { - $use_ssl = getenv('OBJECTSTORE_S3_SSL'); - $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE'); - $CONFIG = array( - 'objectstore' => array( - 'class' => '\OC\Files\ObjectStore\S3', - 'arguments' => array( - 'bucket' => getenv('OBJECTSTORE_S3_BUCKET'), - 'key' => getenv('OBJECTSTORE_S3_KEY') ?: '', - 'secret' => getenv('OBJECTSTORE_S3_SECRET') ?: '', - 'region' => getenv('OBJECTSTORE_S3_REGION') ?: '', - 'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '', - 'port' => getenv('OBJECTSTORE_S3_PORT') ?: '', - 'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true, - // required for some non Amazon S3 implementations - 'use_path_style' => $use_path == true && strtolower($use_path) !== 'false' - ) - ) - ); -} diff --git a/18.0-rc/apache/config/smtp.config.php b/18.0-rc/apache/config/smtp.config.php deleted file mode 100644 index 59f1eaa1..00000000 --- a/18.0-rc/apache/config/smtp.config.php +++ /dev/null @@ -1,15 +0,0 @@ -<?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'), - ); -} diff --git a/18.0-rc/apache/config/swift.config.php b/18.0-rc/apache/config/swift.config.php deleted file mode 100644 index 47ada566..00000000 --- a/18.0-rc/apache/config/swift.config.php +++ /dev/null @@ -1,31 +0,0 @@ -<?php -if (getenv('OBJECTSTORE_SWIFT_URL')) { - $autocreate = getenv('OBJECTSTORE_SWIFT_AUTOCREATE'); - $CONFIG = array( - 'objectstore' => [ - 'class' => 'OC\\Files\\ObjectStore\\Swift', - 'arguments' => [ - 'autocreate' => $autocreate == true && strtolower($autocreate) !== 'false', - 'user' => [ - 'name' => getenv('OBJECTSTORE_SWIFT_USER_NAME'), - 'password' => getenv('OBJECTSTORE_SWIFT_USER_PASSWORD'), - 'domain' => [ - 'name' => (getenv('OBJECTSTORE_SWIFT_USER_DOMAIN')) ?: 'Default', - ], - ], - 'scope' => [ - 'project' => [ - 'name' => getenv('OBJECTSTORE_SWIFT_PROJECT_NAME'), - 'domain' => [ - 'name' => (getenv('OBJECTSTORE_SWIFT_PROJECT_DOMAIN')) ?: 'Default', - ], - ], - ], - 'serviceName' => (getenv('OBJECTSTORE_SWIFT_SERVICE_NAME')) ?: 'swift', - 'region' => getenv('OBJECTSTORE_SWIFT_REGION'), - 'url' => getenv('OBJECTSTORE_SWIFT_URL'), - 'bucket' => getenv('OBJECTSTORE_SWIFT_CONTAINER_NAME'), - ] - ] - ); -} |