cloudron
/
freshrss-app
mirror of https://git.cloudron.io/cloudron/freshrss-app
1
0
Fork 0
Code Issues Releases Wiki Activity

only generate oidc secret for oidc

This commit is contained in:
Girish Ramakrishnan 2023-10-27 15:15:41 +02:00
parent 2cfffbced7
commit 278637ef3a
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
start.sh
View File

@ -22,12 +22,6 @@ if ! [ -f /app/data/.installed ]; then
echo "==> Done." echo "==> Done."
fi fi
echo "==> Get OAUTH Crypto Passphrase"
if [[ ! -f /app/data/.oauth_crypto_passphrase ]]; then
openssl rand -base64 42 > /app/data/.oauth_crypto_passphrase
fi
export OIDC_CRYPTO_PASSPHRASE=$(</app/data/.oauth_crypto_passphrase)
if [[ ! -f /app/data/php.ini ]]; then if [[ ! -f /app/data/php.ini ]]; then
echo -e "; Add custom PHP configuration in this file\n; Settings here are merged with the package's built-in php.ini\n\n" > /app/data/php.ini echo -e "; Add custom PHP configuration in this file\n; Settings here are merged with the package's built-in php.ini\n\n" > /app/data/php.ini
fi fi
@ -45,18 +39,20 @@ for f in $(ls /app/code/extensions-orig); do
done done
echo "==> Updating config file" echo "==> Updating config file"
php cli/reconfigure.php --default_user admin --base_url "https://${CLOUDRON_APP_DOMAIN}" \ if [[ -z "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
extra_args="--default_user admin"
[[ ! -f /app/data/.oauth_crypto_passphrase ]] && openssl rand -base64 42 > /app/data/.oauth_crypto_passphrase
export OIDC_CRYPTO_PASSPHRASE=$(</app/data/.oauth_crypto_passphrase) # used in apache config
else
extra_args="--auth_type http_auth"
fi
php cli/reconfigure.php ${extra_args} --base_url "https://${CLOUDRON_APP_DOMAIN}" \
--db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \ --db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \
--db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \ --db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \
--db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \ --db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \
--disable_update --disable_update
if [[ -z "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
php cli/reconfigure.php --default_user admin
else
php cli/reconfigure.php --auth_type "http_auth"
fi
echo "==> Setting permissions" echo "==> Setting permissions"
chown -R www-data.www-data /run/php /app/data /tmp/log_api.txt chown -R www-data.www-data /run/php /app/data /tmp/log_api.txt