Config tidying for new version

.env.sample

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

abra.sh

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

compose.yml

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

entrypoint.sh.tmpl

@@ -5,19 +5,19 @@ configure_php() {
 	# already loads its config from environment variables but unless we make these
 	# changes, it can't access them. See 
 	#	https://github.com/docker-library/php/pull/93/files
-	if ! grep -q '^clear_env = no' /etc/php7/php-fpm.d/www.conf; then
-		sed -i 's/;clear_env = no/clear_env = no/' /etc/php7/php-fpm.d/www.conf
+	if ! grep -q '^clear_env = no' /etc/php8/php-fpm.d/www.conf; then
+		sed -i 's/;clear_env = no/clear_env = no/' /etc/php8/php-fpm.d/www.conf
 	fi
-	if ! grep -q '^clear_env = no' /etc/php7/php-fpm.conf; then
-		echo 'clear_env = no' >> /etc/php7/php-fpm.conf 
+	if ! grep -q '^clear_env = no' /etc/php8/php-fpm.conf; then
+		echo 'clear_env = no' >> /etc/php8/php-fpm.conf 
 	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' \
-			/etc/php7/php.ini
+			/etc/php8/php.ini
 	fi
 }
 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)
 }