From 4053ea4fb07db2416348234d41f19b63083a5341 Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Thu, 6 Feb 2020 12:36:18 +0100
Subject: Run update.sh

Signed-off-by: Tilo Spannagel <development@tilosp.de>
---
 15.0/apache/config/apache-pretty-urls.config.php |  4 ---
 15.0/apache/config/apcu.config.php               |  4 ---
 15.0/apache/config/apps.config.php               | 15 ------------
 15.0/apache/config/autoconfig.php                | 31 ------------------------
 15.0/apache/config/redis.config.php              | 17 -------------
 15.0/apache/config/smtp.config.php               | 15 ------------
 6 files changed, 86 deletions(-)
 delete mode 100644 15.0/apache/config/apache-pretty-urls.config.php
 delete mode 100644 15.0/apache/config/apcu.config.php
 delete mode 100644 15.0/apache/config/apps.config.php
 delete mode 100644 15.0/apache/config/autoconfig.php
 delete mode 100644 15.0/apache/config/redis.config.php
 delete mode 100644 15.0/apache/config/smtp.config.php

(limited to '15.0/apache/config')

diff --git a/15.0/apache/config/apache-pretty-urls.config.php b/15.0/apache/config/apache-pretty-urls.config.php
deleted file mode 100644
index 72da1d8c..00000000
--- a/15.0/apache/config/apache-pretty-urls.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
-  'htaccess.RewriteBase' => '/',
-);
diff --git a/15.0/apache/config/apcu.config.php b/15.0/apache/config/apcu.config.php
deleted file mode 100644
index 69fed876..00000000
--- a/15.0/apache/config/apcu.config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$CONFIG = array (
-  'memcache.local' => '\OC\Memcache\APCu',
-);
diff --git a/15.0/apache/config/apps.config.php b/15.0/apache/config/apps.config.php
deleted file mode 100644
index a4bed833..00000000
--- a/15.0/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/15.0/apache/config/autoconfig.php b/15.0/apache/config/autoconfig.php
deleted file mode 100644
index deeabe4e..00000000
--- a/15.0/apache/config/autoconfig.php
+++ /dev/null
@@ -1,31 +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) {
-    if (getenv('NEXTCLOUD_TABLE_PREFIX')) {
-        $AUTOCONFIG["dbtableprefix"] = getenv('NEXTCLOUD_TABLE_PREFIX');
-    }
-
-    $AUTOCONFIG["directory"] = getenv('NEXTCLOUD_DATA_DIR') ?: "/var/www/html/data";
-}
diff --git a/15.0/apache/config/redis.config.php b/15.0/apache/config/redis.config.php
deleted file mode 100644
index 9429c901..00000000
--- a/15.0/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' => 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/15.0/apache/config/smtp.config.php b/15.0/apache/config/smtp.config.php
deleted file mode 100644
index 59f1eaa1..00000000
--- a/15.0/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'),
-  );
-}
-- 
cgit v1.2.3