From 99a7753d92043921ca171ab11b98226731ccaeb3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 23 Feb 2021 00:05:49 +0300 Subject: [PATCH] config.php cleanup --- app/config.docker.php | 168 ------------------------------------ app/config.php-config.d | 7 -- app/config.php-dist | 170 ------------------------------------- app/config.php-xaccel | 1 - app/prepare-config.php | 6 -- app/prepare-environment.sh | 4 - 6 files changed, 356 deletions(-) delete mode 100644 app/config.php-config.d delete mode 100644 app/config.php-dist delete mode 100644 app/config.php-xaccel delete mode 100755 app/prepare-config.php delete mode 100755 app/prepare-environment.sh diff --git a/app/config.docker.php b/app/config.docker.php index 5b66bcc..1451c8a 100644 --- a/app/config.docker.php +++ b/app/config.docker.php @@ -1,173 +1,5 @@ System), syslog - logs to system log. - // Setting this to blank uses PHP logging (usually to http server - // error.log). - // Note that feed updating daemons don't use this logging facility - // for normal output. - - define('CONFIG_VERSION', getenv('TTRSS_CONFIG_VERSION')); - // Expected config version. Please update this option in config.php - // if necessary (after migrating all new options from this file). - - // vim:ft=php $snippets = glob(getenv("SCRIPT_ROOT")."/config.d/*.php"); foreach ($snippets as $snippet) { diff --git a/app/config.php-config.d b/app/config.php-config.d deleted file mode 100644 index ae7a85b..0000000 --- a/app/config.php-config.d +++ /dev/null @@ -1,7 +0,0 @@ - $snippets = glob(getenv("SCRIPT_ROOT")."/config.d/*.php"); - - foreach ($snippets as $snippet) { - require_once $snippet; - } - - diff --git a/app/config.php-dist b/app/config.php-dist deleted file mode 100644 index eed1a69..0000000 --- a/app/config.php-dist +++ /dev/null @@ -1,170 +0,0 @@ - System), syslog - logs to system log. - // Setting this to blank uses PHP logging (usually to http server - // error.log). - // Note that feed updating daemons don't use this logging facility - // for normal output. - - define('CONFIG_VERSION', 26); - // Expected config version. Please update this option in config.php - // if necessary (after migrating all new options from this file). - - // vim:ft=php diff --git a/app/config.php-xaccel b/app/config.php-xaccel deleted file mode 100644 index 8b77dd0..0000000 --- a/app/config.php-xaccel +++ /dev/null @@ -1 +0,0 @@ - define('NGINX_XACCEL_PREFIX', '/tt-rss'); diff --git a/app/prepare-config.php b/app/prepare-config.php deleted file mode 100755 index 1a82ce9..0000000 --- a/app/prepare-config.php +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -sed -e "s/define('\([A-Z_]\+\)', [^)]\+/define('\1', getenv('TTRSS_\1')/" \ - < config.php-dist > config.docker.php - -cat config.php-config.d config.php-xaccel >> config.docker.php diff --git a/app/prepare-environment.sh b/app/prepare-environment.sh deleted file mode 100755 index dcbb302..0000000 --- a/app/prepare-environment.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -grep define config.php-dist | sed -e "s/[ \t]*define('\([A-Z_]\+\)', ['\"]\?\([^'\")]\+\).*/ENV TTRSS_\1=\"\2\"/" \ - -e 's/"false"/""/'