coop-cloud/selfoss
coop-cloud
/
selfoss
0
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

Config tidying for new version
continuous-integration/drone/push Build is passing Details

This commit is contained in:
3wc 2024-02-10 20:23:40 -03:00
parent 724410ec71
commit a4c412bc2a
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.sample
View File

@ -15,8 +15,7 @@ SELFOSS_DB_TYPE=sqlite
# Set these two variables to enable authentication # Set these two variables to enable authentication
SELFOSS_USERNAME= SELFOSS_USERNAME=
SELFOSS_PASSWORD= SELFOSS_PASSWORD=
# The recommended /password hash script currently seems broken; use this instead: # Visit /password on your instance to generate a password hash
# http://www.passwordtool.hu/php5-password-hash-generator
# Options are EMERGENCY, ALERT, CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG, None # Options are EMERGENCY, ALERT, CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG, None
SELFOSS_LOGGER_LEVEL=ERROR SELFOSS_LOGGER_LEVEL=ERROR

2
abra.sh
View File

@ -1 +1 @@
export ENTRYPOINT_CONF_VERSION=v7 export ENTRYPOINT_CONF_VERSION=v9

6
compose.yml
View File

@ -13,9 +13,11 @@ services:
- SELFOSS_DB_TYPE - SELFOSS_DB_TYPE
- SELFOSS_LOGGER_LEVEL - SELFOSS_LOGGER_LEVEL
# Not working yet :/ # Not working yet :/
#- SELFOSS_WALLABAG - SELFOSS_WALLABAG
#- SELFOSS_WALLABAG_VERSION - SELFOSS_WALLABAG_VERSION
- SELFOSS_MASTODON
- SELFOSS_SHARE - SELFOSS_SHARE
- SELFOSS_BASE_URL=https://${DOMAIN}/
#secrets: #secrets:
# TODO 3wc: see above note about issue #3 # TODO 3wc: see above note about issue #3
#- selfoss_password #- selfoss_password

14
entrypoint.sh.tmpl
View File

@ -5,19 +5,19 @@ configure_php() {
# already loads its config from environment variables but unless we make these # already loads its config from environment variables but unless we make these
# changes, it can't access them. See # changes, it can't access them. See
# https://github.com/docker-library/php/pull/93/files # https://github.com/docker-library/php/pull/93/files
if ! grep -q '^clear_env = no' /etc/php7/php-fpm.d/www.conf; then if ! grep -q '^clear_env = no' /etc/php8/php-fpm.d/www.conf; then
sed -i 's/;clear_env = no/clear_env = no/' /etc/php7/php-fpm.d/www.conf sed -i 's/;clear_env = no/clear_env = no/' /etc/php8/php-fpm.d/www.conf
fi fi
if ! grep -q '^clear_env = no' /etc/php7/php-fpm.conf; then if ! grep -q '^clear_env = no' /etc/php8/php-fpm.conf; then
echo 'clear_env = no' >> /etc/php7/php-fpm.conf echo 'clear_env = no' >> /etc/php8/php-fpm.conf
fi fi
if ! grep -q 'variables_order = "EGPCS"' /etc/php7/php.ini; then if ! grep -q 'variables_order = "EGPCS"' /etc/php8/php.ini; then
sed -i 's/variables_order = "GPCS"/variables_order = "EGPCS"/g' \ sed -i 's/variables_order = "GPCS"/variables_order = "EGPCS"/g' \
/etc/php7/php.ini /etc/php8/php.ini
fi fi
} }
load_vars() { load_vars() {
export SELFOSS_PASSWORD=$(cat $SELFOSS_PASSWORD_FILE) #export SELFOSS_PASSWORD=$(cat $SELFOSS_PASSWORD_FILE)
export SELFOSS_DB_PASSWORD=$(cat $SELFOSS_DB_PASSWORD_FILE) export SELFOSS_DB_PASSWORD=$(cat $SELFOSS_DB_PASSWORD_FILE)
} }