overlay/etc/templates/constants.local.php.tmpl

@@ -1,15 +1,15 @@
 <?php
-define('FRESHRSS_USERAGENT', 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')');
-define('PHP_COMPRESSION', false);
-define('COPY_SYSLOG_TO_STDERR', true);
-define('MAX_LOG_SIZE', 1048576);
-define('DATA_PATH', FRESHRSS_PATH . '/data');
+safe_define('FRESHRSS_USERAGENT', 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')');
+safe_define('PHP_COMPRESSION', false);
+safe_define('COPY_SYSLOG_TO_STDERR', true);
+safe_define('MAX_LOG_SIZE', 1048576);
+safe_define('DATA_PATH', FRESHRSS_PATH . '/data');
 
-define('UPDATE_FILENAME', DATA_PATH . '/update.php');
-define('USERS_PATH', DATA_PATH . '/users');
-define('ADMIN_LOG', USERS_PATH . '/_/log.txt');
-define('API_LOG', USERS_PATH . '/_/log_api.txt');
-define('CACHE_PATH', DATA_PATH . '/cache');
-define('PSHB_LOG', USERS_PATH . '/_/log_pshb.txt');
-define('PSHB_PATH', DATA_PATH . '/PubSubHubbub');
-define('TMP_PATH', CACHE_PATH);
+safe_define('UPDATE_FILENAME', DATA_PATH . '/update.php');
+safe_define('USERS_PATH', DATA_PATH . '/users');
+safe_define('ADMIN_LOG', USERS_PATH . '/_/log.txt');
+safe_define('API_LOG', USERS_PATH . '/_/log_api.txt');
+safe_define('CACHE_PATH', DATA_PATH . '/cache');
+safe_define('PSHB_LOG', USERS_PATH . '/_/log_pshb.txt');
+safe_define('PSHB_PATH', DATA_PATH . '/PubSubHubbub');
+safe_define('TMP_PATH', CACHE_PATH);

overlay/usr/local/bin/entrypoint

@@ -9,43 +9,30 @@ if [ -n "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" ] && [ ! -f "/var/www/.postgresql/ro
 fi
 
 printf "\nPrepare FreshRSS...\n"
-/usr/bin/php -f ./cli/prepare.php >/dev/null 2>&1
-
-/usr/bin/php -f ./cli/do-install.php -- --api_enabled \
-    --base_url "${FRESHRSS_BASE_URL:-http://localhost/}" \
-    --db-base "${FRESHRSS_DB_BASE}" \
-    --db-host "${FRESHRSS_DB_HOST:-localhost}" \
-    --db-password "${FRESHRSS_DB_PASSWORD}" \
-    --db-type "${FRESHRSS_DB_TYPE:-sqlite}" \
-    --db-user "${FRESHRSS_DB_USER}" \
-    --default_user "${FRESHRSS_DEFAULT_USER:-_}" \
-    --language "${FRESHRSS_LANGUAGE:-en}" >/dev/null 2>&1
-EXITCODE=$?
-
-if [ $EXITCODE -eq 3 ]; then
-    printf 'FreshRSS already installed, no change performed\n'
-elif [ $EXITCODE -eq 0 ]; then
-    printf 'FreshRSS successfully installed\n'
-else
-    printf 'FreshRSS error during installation\n'
-    exit $EXITCODE
+PREP=$(/usr/bin/php -f ./cli/prepare.php)
+if [ $? -ne 0 ]; then
+    echo "$PREP"
+    exit 1
 fi
 
 if [ "${FRESHRSS_DEFAULT_USER}" ]; then
     printf "\nEnsure default user exists...\n"
-    /usr/bin/php ./cli/create-user.php --user "$FRESHRSS_DEFAULT_USER" --password "$FRESHRSS_DEFAULT_PASSWORD" --language "${FRESHRSS_LANGUAGE:-en}" >/dev/null 2>&1
-    EXITCODE=$?
-
-    if [ $EXITCODE -eq 3 ]; then
-        printf 'FreshRSS user already exists, no change performed\n'
-    elif [ $EXITCODE -eq 0 ]; then
-        printf 'FreshRSS user successfully created\n'
-        ./cli/list-users.php | xargs -n1 ./cli/actualize-user.php --user "$FRESHRSS_DEFAULT_USER"
-    else
-        rm -f /tmp/out.txt /tmp/err.txt
-        printf 'FreshRSS error during the creation of a user\n'
-        exit $EXITCODE
+    UCREATE=$(/usr/bin/php ./cli/create-user.php --user "$FRESHRSS_DEFAULT_USER" --password "$FRESHRSS_DEFAULT_PASSWORD" 2>&1)
+    if [ $? -ne 0 ]; then
+        case "$UCREATE" in
+          *"username already taken"*) ;;
+          *)
+          echo "$UCREATE"
+          rm -rf "/var/www/app/data/users/$FRESHRSS_DEFAULT_USER"
+          exit 1
+          ;;
+        esac
     fi
+    printf "Result: success\n\n"
+fi
+
+if [ -f "/var/www/app/data/do-install.txt" ]; then
+    rm -rf /var/www/app/data/do-install.txt
 fi
 
 supercronic /etc/crontabs/nginx &