kienan
/
ttrss-container
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re-enable nginx_xaccel; remove the rest of sed stuff from startup

This commit is contained in:
Andrew Dolgov 2021-02-01 10:30:31 +03:00
parent 2861bd88db
commit fdd507c179
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Dockerfile
View File

@ -54,7 +54,7 @@ ENV TTRSS_SMTP_FROM_ADDRESS="noreply@your.domain.dom"
ENV TTRSS_DIGEST_SUBJECT="[tt-rss] New headlines for last 24 hours" ENV TTRSS_DIGEST_SUBJECT="[tt-rss] New headlines for last 24 hours"
ENV TTRSS_CHECK_FOR_UPDATES="true" ENV TTRSS_CHECK_FOR_UPDATES="true"
ENV TTRSS_ENABLE_GZIP_OUTPUT="" ENV TTRSS_ENABLE_GZIP_OUTPUT=""
ENV TTRSS_PLUGINS="auth_internal, note" ENV TTRSS_PLUGINS="auth_internal, note, nginx_xaccel"
ENV TTRSS_LOG_DESTINATION="sql" ENV TTRSS_LOG_DESTINATION="sql"
ENV TTRSS_CONFIG_VERSION="26" ENV TTRSS_CONFIG_VERSION="26"

6
app/config.docker.php
View File

@ -170,5 +170,9 @@
// vim:ft=php // vim:ft=php
$snippets = glob("/opt/tt-rss/config.d/*.php"); $snippets = glob("/opt/tt-rss/config.d/*.php");
foreach ($snippets as $snippet) foreach ($snippets as $snippet) {
require_once $snippet; require_once $snippet;
}
define('NGINX_XACCEL_PREFIX', '/tt-rss');

5
app/config.php-config.d
View File

@ -1,4 +1,7 @@
$snippets = glob("/opt/tt-rss/config.d/*.php"); $snippets = glob("/opt/tt-rss/config.d/*.php");
foreach ($snippets as $snippet) foreach ($snippets as $snippet) {
require_once $snippet; require_once $snippet;
}

1
app/config.php-xaccel Normal file
View File

@ -0,0 +1 @@
define('NGINX_XACCEL_PREFIX', '/tt-rss');

2
app/prepare-config.php
View File

@ -3,4 +3,4 @@
sed -e "s/define('\([A-Z_]\+\)', [^)]\+/define('\1', getenv('TTRSS_\1')/" \ sed -e "s/define('\([A-Z_]\+\)', [^)]\+/define('\1', getenv('TTRSS_\1')/" \
< config.php-dist > config.docker.php < config.php-dist > config.docker.php
cat config.php-config.d >> config.docker.php cat config.php-config.d config.php-xaccel >> config.docker.php

4
app/startup.sh
View File

@ -72,10 +72,6 @@ fi
if [ ! -s $DST_DIR/config.php ]; then if [ ! -s $DST_DIR/config.php ]; then
cp /config.docker.php $DST_DIR/config.php cp /config.docker.php $DST_DIR/config.php
cat >> $DST_DIR/config.php << EOF
define('NGINX_XACCEL_PREFIX', '/tt-rss');
EOF
else else
egrep -q 'SELF_URL_PATH.*getenv' $DST_DIR/config.php || \ egrep -q 'SELF_URL_PATH.*getenv' $DST_DIR/config.php || \
echo -e "\nWARNING: you're using old-style config.php, overrides via .env will not work.\n" >/dev/stderr echo -e "\nWARNING: you're using old-style config.php, overrides via .env will not work.\n" >/dev/stderr