From ea460bdbf56461e592bae2b43dfab680c4ce1a03 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Wed, 6 Oct 2021 21:58:09 +0200 Subject: [PATCH] apply configuration sync changes to all images --- 2021.09/apache/entrypoint.sh | 4 ++-- 2021.09/fpm-alpine/entrypoint.sh | 4 ++-- 2021.09/fpm/entrypoint.sh | 4 ++-- 2021.12-dev/apache/entrypoint.sh | 4 ++-- 2021.12-dev/fpm-alpine/entrypoint.sh | 4 ++-- 2021.12-dev/fpm/entrypoint.sh | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/2021.09/apache/entrypoint.sh b/2021.09/apache/entrypoint.sh index fa51564..0739dd4 100755 --- a/2021.09/apache/entrypoint.sh +++ b/2021.09/apache/entrypoint.sh @@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/ # Update docker-based config files, but never delete other config files - rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/ + rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/ # In case there is no .htaccess, copy it from the default dist file if [ ! -f "/var/www/html/.htaccess" ]; then @@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # load other config files (*.config.php) to the config folder if [ -d "/usr/src/config" ]; then - rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ + rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/ fi echo "Installation finished" diff --git a/2021.09/fpm-alpine/entrypoint.sh b/2021.09/fpm-alpine/entrypoint.sh index fa51564..0739dd4 100755 --- a/2021.09/fpm-alpine/entrypoint.sh +++ b/2021.09/fpm-alpine/entrypoint.sh @@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/ # Update docker-based config files, but never delete other config files - rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/ + rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/ # In case there is no .htaccess, copy it from the default dist file if [ ! -f "/var/www/html/.htaccess" ]; then @@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # load other config files (*.config.php) to the config folder if [ -d "/usr/src/config" ]; then - rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ + rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/ fi echo "Installation finished" diff --git a/2021.09/fpm/entrypoint.sh b/2021.09/fpm/entrypoint.sh index fa51564..0739dd4 100755 --- a/2021.09/fpm/entrypoint.sh +++ b/2021.09/fpm/entrypoint.sh @@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/ # Update docker-based config files, but never delete other config files - rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/ + rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/ # In case there is no .htaccess, copy it from the default dist file if [ ! -f "/var/www/html/.htaccess" ]; then @@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # load other config files (*.config.php) to the config folder if [ -d "/usr/src/config" ]; then - rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ + rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/ fi echo "Installation finished" diff --git a/2021.12-dev/apache/entrypoint.sh b/2021.12-dev/apache/entrypoint.sh index fa51564..0739dd4 100755 --- a/2021.12-dev/apache/entrypoint.sh +++ b/2021.12-dev/apache/entrypoint.sh @@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/ # Update docker-based config files, but never delete other config files - rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/ + rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/ # In case there is no .htaccess, copy it from the default dist file if [ ! -f "/var/www/html/.htaccess" ]; then @@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # load other config files (*.config.php) to the config folder if [ -d "/usr/src/config" ]; then - rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ + rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/ fi echo "Installation finished" diff --git a/2021.12-dev/fpm-alpine/entrypoint.sh b/2021.12-dev/fpm-alpine/entrypoint.sh index fa51564..0739dd4 100755 --- a/2021.12-dev/fpm-alpine/entrypoint.sh +++ b/2021.12-dev/fpm-alpine/entrypoint.sh @@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/ # Update docker-based config files, but never delete other config files - rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/ + rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/ # In case there is no .htaccess, copy it from the default dist file if [ ! -f "/var/www/html/.htaccess" ]; then @@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # load other config files (*.config.php) to the config folder if [ -d "/usr/src/config" ]; then - rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ + rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/ fi echo "Installation finished" diff --git a/2021.12-dev/fpm/entrypoint.sh b/2021.12-dev/fpm/entrypoint.sh index fa51564..0739dd4 100755 --- a/2021.12-dev/fpm/entrypoint.sh +++ b/2021.12-dev/fpm/entrypoint.sh @@ -74,7 +74,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/friendica/ /var/www/html/ # Update docker-based config files, but never delete other config files - rsync $rsync_options --update /usr/src/friendica/config/ /var/www/html/config/ + rsync $rsync_options --update --exclude=/addon.config.php --exclude=/local.config.php /usr/src/friendica/config/ /var/www/html/config/ # In case there is no .htaccess, copy it from the default dist file if [ ! -f "/var/www/html/.htaccess" ]; then @@ -123,7 +123,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # load other config files (*.config.php) to the config folder if [ -d "/usr/src/config" ]; then - rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ + rsync $rsync_options --ignore-existing /usr/src/friendica/config/ /var/www/html/config/ fi echo "Installation finished"