diff --git a/.env.sample b/.env.sample index 387fb83..d74bed7 100644 --- a/.env.sample +++ b/.env.sample @@ -28,6 +28,9 @@ LETS_ENCRYPT_ENV=production # PHP composer for plugin installation #COMPOSE_FILE="$COMPOSE_FILE:compose.composer.yml" +# Self managed Wordpress for automatic updates +#COMPOSE_FILE="$COMPOSE_FILE:compose.selfmanaged.yml" + #WORDPRESS_DEBUG=true ## Additional extensions @@ -81,7 +84,6 @@ SECRET_DB_PASSWORD_VERSION=v1 # 🚩🚩 dangerous, use only for development sites! #CORS_ALLOW_ALL=1 - # FTP #COMPOSE_FILE="$COMPOSE_FILE:compose.ftp.yml" #SECRET_FTP_PASS_VERSION=v1 diff --git a/abra.sh b/abra.sh index 6b3650d..d087fa6 100644 --- a/abra.sh +++ b/abra.sh @@ -1,8 +1,8 @@ export PHP_UPLOADS_CONF_VERSION=v4 -export ENTRYPOINT_CONF_VERSION=v7 +export ENTRYPOINT_CONF_VERSION=v8 export ENTRYPOINT_MAILRELAY_CONF_VERSION=v2 export MSMTP_CONF_VERSION=v4 -export HTACCESS_CONF_VERSION=v2 +export HTACCESS_CONF_VERSION=v3 export USERS_CONF_VERSION=v1 wp() { @@ -31,8 +31,6 @@ core_install(){ wp "language core install $LOCALE" wp "site switch-language $LOCALE" wp "rewrite structure '/%year%/%monthnum%/%day%/%postname%/'" - wp "plugin install --activate disable-update-notifications" - wp "option update disable_notification_setting --format=json '{\"dpun_setting\":false,\"dwtu_setting\":false,\"dwcun_setting\":true}'" if [ -n "$DEFAULT_USER_ROLE" ] then wp "option set default_role $DEFAULT_USER_ROLE" @@ -40,7 +38,20 @@ core_install(){ wp "option set default_role subscriber" fi wp "theme auto-updates enable --all" - wp 'plugin auto-updates enable --all' || exit 0 + wp 'plugin auto-updates enable --all' || true +} + +enable_auto_updates(){ + wp "plugin deactivate disable-update-notifications --allow-root" + wp "plugin uninstall disable-update-notifications --allow-root" + wp "option delete disable_notification_setting --allow-root" + wp "plugin auto-updates enable --all --allow-root" + wp "theme auto-updates enable --all --allow-root" +} + +disable_auto_updates(){ + wp "plugin install --activate disable-update-notifications" + wp "option update disable_notification_setting --format=json '{\"dpun_setting\":false,\"dwtu_setting\":false,\"dwcun_setting\":true}'" } set_authentik(){ diff --git a/compose.selfmanaged.yml b/compose.selfmanaged.yml new file mode 100644 index 0000000..100308c --- /dev/null +++ b/compose.selfmanaged.yml @@ -0,0 +1,21 @@ +--- +version: "3.8" + +services: + app: + image: "wordpress:latest" + volumes: + - "wordpress:/var/www/html/" + environment: + WORDPRESS_CONFIG_EXTRA: | + define( 'AUTOMATIC_UPDATER_DISABLED', false ); + define( 'WP_AUTO_UPDATE_CORE', true ); + define( 'FS_METHOD', 'direct' ); + ${WORDPRESS_CONFIG_EXTRA} + + ftp: + volumes: + - "wordpress:/home/ftp_user/" + +volumes: + wordpress: diff --git a/compose.yml b/compose.yml index f9645b8..0fdfb5c 100644 --- a/compose.yml +++ b/compose.yml @@ -62,7 +62,7 @@ services: - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}/$${2}" - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.permanent=true" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}" - - "coop-cloud.${STACK_NAME}.version=2.19.1+6.9.4" + - "coop-cloud.${STACK_NAME}.version=2.19.2+6.9.4" db: image: "mariadb:12.2" diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index 035fbf1..472395c 100644 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -42,6 +42,19 @@ define('FORCE_SSL_ADMIN', true ); define('COOKIE_DOMAIN', \$_SERVER['HTTP_HOST']);" {{ end }} + +UPLOADS_HTACCESS=/var/www/html/wp-content/uploads/.htaccess +if [ ! -f "$UPLOADS_HTACCESS" ]; then + mkdir -p /var/www/html/wp-content/uploads + cat > "$UPLOADS_HTACCESS" <<'EOF' +# Prevent PHP execution in uploads directory + + Require all denied + +EOF + chown www-data:www-data "$UPLOADS_HTACCESS" +fi + if [ -n "$@" ]; then "$@" fi diff --git a/htaccess.tmpl b/htaccess.tmpl index 8079582..11b2574 100644 --- a/htaccess.tmpl +++ b/htaccess.tmpl @@ -1,3 +1,8 @@ +# Protect sensitive files from direct access + + Require all denied + + {{ if eq (env "MULTISITE") "" -}} # BEGIN WordPress