web/docker-ttrss
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made resetting the theme optional via TTRSS_THEME_RESET env var. Default is resetting the theme to the default one though. Untested.

Browse Source
This commit is contained in:
x86dev 2019-07-25 23:25:45 +02:00
parent 472b083f7d
commit 8565deba18
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
root/srv/setup-ttrss.sh
View File

@ -108,6 +108,11 @@ setup_ttrss()
echo "Setup: URL is: $TTRSS_SELF_URL" echo "Setup: URL is: $TTRSS_SELF_URL"
# By default we want to reset the theme to the default one.
if [ -z ${TTRSS_THEME_RESET} ]; then
TTRSS_THEME_RESET=1
fi
# Patch URL path. # Patch URL path.
sed -i -e 's@htt.*/@'"${TTRSS_SELF_URL}"'@g' ${TTRSS_PATH}/config.php sed -i -e 's@htt.*/@'"${TTRSS_SELF_URL}"'@g' ${TTRSS_PATH}/config.php
@ -131,6 +136,11 @@ setup_ttrss()
echo "Setup: Additional plugins: $TTRSS_PLUGINS" echo "Setup: Additional plugins: $TTRSS_PLUGINS"
sed -i -e "s/.*define('PLUGINS'.*/define('PLUGINS', '$TTRSS_PLUGINS, auth_internal, note, updater');/g" ${TTRSS_PATH}/config.php sed -i -e "s/.*define('PLUGINS'.*/define('PLUGINS', '$TTRSS_PLUGINS, auth_internal, note, updater');/g" ${TTRSS_PATH}/config.php
# Export variables for sub shells.
export TTRSS_PATH
export TTRSS_PATH_PLUGINS
export TTRSS_THEME_RESET
} }
setup_db() setup_db()

2
root/srv/ttrss-configure-db.php
View File

@ -65,11 +65,13 @@ try {
echo 'Connection to database successful' . PHP_EOL; echo 'Connection to database successful' . PHP_EOL;
// Reached this point => table found, assume db is complete // Reached this point => table found, assume db is complete
if (env('TTRSS_THEME_RESET', '1')) {
// Make sure to set the default theme provided by TT-RSS. // Make sure to set the default theme provided by TT-RSS.
// Other themes might break everything after an update, so play safe here. // Other themes might break everything after an update, so play safe here.
echo 'Resetting theme to default ...' . PHP_EOL; echo 'Resetting theme to default ...' . PHP_EOL;
$pdo->query("UPDATE ttrss_user_prefs SET value = '' WHERE pref_name = 'USER_CSS_THEME'"); $pdo->query("UPDATE ttrss_user_prefs SET value = '' WHERE pref_name = 'USER_CSS_THEME'");
} }
}
catch (PDOException $e) { catch (PDOException $e) {
echo 'Database table not found, applying schema... ' . PHP_EOL; echo 'Database table not found, applying schema... ' . PHP_EOL;
$schema = file_get_contents($confpath . 'schema/ttrss_schema_' . $config['DB_TYPE'] . '.sql'); $schema = file_get_contents($confpath . 'schema/ttrss_schema_' . $config['DB_TYPE'] . '.sql');