diff --git a/.docker-files/cron.sh b/.docker-files/cron.sh index ce4d3ae..e7f96e3 100644 --- a/.docker-files/cron.sh +++ b/.docker-files/cron.sh @@ -1,7 +1,7 @@ #!/bin/sh trap "break;exit" HUP INT TERM -while [ ! -f /var/www/html/config/local.ini.php ]; do +while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do sleep 1 done diff --git a/.docker-files/entrypoint.sh b/.docker-files/entrypoint.sh index 26bd8b6..c0c86e2 100644 --- a/.docker-files/entrypoint.sh +++ b/.docker-files/entrypoint.sh @@ -101,7 +101,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # no downgrading possible if version_greater "$installed_version" "$image_version"; then - echo 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0 + echo 'Can'\''t copy Friendica sources because the version of the data ('$installed_version') is higher than the docker image ('$image_version')', 0 exit 1; fi fi @@ -158,10 +158,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # shellcheck disable=SC2016 install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'"' install=true - elif [ -f "/usr/src/config/local.ini.php" ]; then - echo "Installation with prepared local.ini.php" + elif [ -f "/usr/src/config/local.config.php" ]; then + echo "Installation with prepared local.config.php" - install_options="-f /usr/src/local.ini.php" + install_options="-f /usr/src/local.config.php" install=true fi @@ -174,7 +174,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled - # load other config files (*.ini.php) to the config folder (currently only local.ini.php and addon.ini.php supported) + # load other config files (*.config.php) to the config folder (currently only local.config.php and addon.config.php supported) if [ -d "/usr/src/config" ]; then rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ fi diff --git a/.docker-files/upgrade.exclude b/.docker-files/upgrade.exclude index 9c6c08f..b1c6486 100644 --- a/.docker-files/upgrade.exclude +++ b/.docker-files/upgrade.exclude @@ -5,4 +5,6 @@ /.htaccess /home.* /config/local.ini.php -/config/addon.ini.php \ No newline at end of file +/config/addon.ini.php +/config/local.config.php +/config/addon.config.php \ No newline at end of file diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile index a9eaeb8..ad75fc9 100644 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/Dockerfile @@ -1,4 +1,4 @@ FROM friendica/server:apache RUN mkdir -p /usr/src/config -COPY addon.ini.php /usr/src/config/ +COPY addon.config.php /usr/src/config/ diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/addon.config.php b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/addon.config.php new file mode 100644 index 0000000..cf58f9e --- /dev/null +++ b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/addon.config.php @@ -0,0 +1,12 @@ + [ + 'cache_driver' => 'redis', + 'lock_driver' => 'redis', + + 'redis_host' => 'redis', + + 'pidfile' => '/var/run/friendica.pid', + ] +]; diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/addon.ini.php b/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/addon.ini.php deleted file mode 100644 index c2bd16d..0000000 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/apache/app/addon.ini.php +++ /dev/null @@ -1,12 +0,0 @@ - [ + 'cache_driver' => 'redis', + 'lock_driver' => 'redis', + + 'redis_host' => 'redis', + + 'pidfile' => '/var/run/friendica.pid', + ] +]; diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/app/addon.ini.php b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/app/addon.ini.php deleted file mode 100644 index c2bd16d..0000000 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm-alpine/app/addon.ini.php +++ /dev/null @@ -1,12 +0,0 @@ - [ + 'cache_driver' => 'redis', + 'lock_driver' => 'redis', + + 'redis_host' => 'redis', + + 'pidfile' => '/var/run/friendica.pid', + ] +]; diff --git a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/addon.ini.php b/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/addon.ini.php deleted file mode 100644 index c2bd16d..0000000 --- a/.examples/docker-compose/insecure/mariadb-cron-redis/fpm/app/addon.ini.php +++ /dev/null @@ -1,12 +0,0 @@ -/dev/null || [ "$1" = "php-fpm" ]; then # no downgrading possible if version_greater "$installed_version" "$image_version"; then - echo 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0 + echo 'Can'\''t copy Friendica sources because the version of the data ('$installed_version') is higher than the docker image ('$image_version')', 0 exit 1; fi fi @@ -158,10 +158,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # shellcheck disable=SC2016 install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'"' install=true - elif [ -f "/usr/src/config/local.ini.php" ]; then - echo "Installation with prepared local.ini.php" + elif [ -f "/usr/src/config/local.config.php" ]; then + echo "Installation with prepared local.config.php" - install_options="-f /usr/src/local.ini.php" + install_options="-f /usr/src/local.config.php" install=true fi @@ -174,7 +174,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled - # load other config files (*.ini.php) to the config folder (currently only local.ini.php and addon.ini.php supported) + # load other config files (*.config.php) to the config folder (currently only local.config.php and addon.config.php supported) if [ -d "/usr/src/config" ]; then rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ fi diff --git a/2018.09/apache/upgrade.exclude b/2018.09/apache/upgrade.exclude index 9c6c08f..b1c6486 100644 --- a/2018.09/apache/upgrade.exclude +++ b/2018.09/apache/upgrade.exclude @@ -5,4 +5,6 @@ /.htaccess /home.* /config/local.ini.php -/config/addon.ini.php \ No newline at end of file +/config/addon.ini.php +/config/local.config.php +/config/addon.config.php \ No newline at end of file diff --git a/2018.09/fpm-alpine/cron.sh b/2018.09/fpm-alpine/cron.sh index ce4d3ae..e7f96e3 100644 --- a/2018.09/fpm-alpine/cron.sh +++ b/2018.09/fpm-alpine/cron.sh @@ -1,7 +1,7 @@ #!/bin/sh trap "break;exit" HUP INT TERM -while [ ! -f /var/www/html/config/local.ini.php ]; do +while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do sleep 1 done diff --git a/2018.09/fpm-alpine/entrypoint.sh b/2018.09/fpm-alpine/entrypoint.sh index 26bd8b6..c0c86e2 100644 --- a/2018.09/fpm-alpine/entrypoint.sh +++ b/2018.09/fpm-alpine/entrypoint.sh @@ -101,7 +101,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # no downgrading possible if version_greater "$installed_version" "$image_version"; then - echo 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0 + echo 'Can'\''t copy Friendica sources because the version of the data ('$installed_version') is higher than the docker image ('$image_version')', 0 exit 1; fi fi @@ -158,10 +158,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # shellcheck disable=SC2016 install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'"' install=true - elif [ -f "/usr/src/config/local.ini.php" ]; then - echo "Installation with prepared local.ini.php" + elif [ -f "/usr/src/config/local.config.php" ]; then + echo "Installation with prepared local.config.php" - install_options="-f /usr/src/local.ini.php" + install_options="-f /usr/src/local.config.php" install=true fi @@ -174,7 +174,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled - # load other config files (*.ini.php) to the config folder (currently only local.ini.php and addon.ini.php supported) + # load other config files (*.config.php) to the config folder (currently only local.config.php and addon.config.php supported) if [ -d "/usr/src/config" ]; then rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ fi diff --git a/2018.09/fpm-alpine/upgrade.exclude b/2018.09/fpm-alpine/upgrade.exclude index 9c6c08f..b1c6486 100644 --- a/2018.09/fpm-alpine/upgrade.exclude +++ b/2018.09/fpm-alpine/upgrade.exclude @@ -5,4 +5,6 @@ /.htaccess /home.* /config/local.ini.php -/config/addon.ini.php \ No newline at end of file +/config/addon.ini.php +/config/local.config.php +/config/addon.config.php \ No newline at end of file diff --git a/2018.09/fpm/cron.sh b/2018.09/fpm/cron.sh index ce4d3ae..e7f96e3 100644 --- a/2018.09/fpm/cron.sh +++ b/2018.09/fpm/cron.sh @@ -1,7 +1,7 @@ #!/bin/sh trap "break;exit" HUP INT TERM -while [ ! -f /var/www/html/config/local.ini.php ]; do +while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do sleep 1 done diff --git a/2018.09/fpm/entrypoint.sh b/2018.09/fpm/entrypoint.sh index 26bd8b6..c0c86e2 100644 --- a/2018.09/fpm/entrypoint.sh +++ b/2018.09/fpm/entrypoint.sh @@ -101,7 +101,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # no downgrading possible if version_greater "$installed_version" "$image_version"; then - echo 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0 + echo 'Can'\''t copy Friendica sources because the version of the data ('$installed_version') is higher than the docker image ('$image_version')', 0 exit 1; fi fi @@ -158,10 +158,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # shellcheck disable=SC2016 install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'"' install=true - elif [ -f "/usr/src/config/local.ini.php" ]; then - echo "Installation with prepared local.ini.php" + elif [ -f "/usr/src/config/local.config.php" ]; then + echo "Installation with prepared local.config.php" - install_options="-f /usr/src/local.ini.php" + install_options="-f /usr/src/local.config.php" install=true fi @@ -174,7 +174,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled - # load other config files (*.ini.php) to the config folder (currently only local.ini.php and addon.ini.php supported) + # load other config files (*.config.php) to the config folder (currently only local.config.php and addon.config.php supported) if [ -d "/usr/src/config" ]; then rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ fi diff --git a/2018.09/fpm/upgrade.exclude b/2018.09/fpm/upgrade.exclude index 9c6c08f..b1c6486 100644 --- a/2018.09/fpm/upgrade.exclude +++ b/2018.09/fpm/upgrade.exclude @@ -5,4 +5,6 @@ /.htaccess /home.* /config/local.ini.php -/config/addon.ini.php \ No newline at end of file +/config/addon.ini.php +/config/local.config.php +/config/addon.config.php \ No newline at end of file diff --git a/2018.12-dev/apache/cron.sh b/2018.12-dev/apache/cron.sh index ce4d3ae..e7f96e3 100644 --- a/2018.12-dev/apache/cron.sh +++ b/2018.12-dev/apache/cron.sh @@ -1,7 +1,7 @@ #!/bin/sh trap "break;exit" HUP INT TERM -while [ ! -f /var/www/html/config/local.ini.php ]; do +while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do sleep 1 done diff --git a/2018.12-dev/apache/entrypoint.sh b/2018.12-dev/apache/entrypoint.sh index 26bd8b6..c0c86e2 100644 --- a/2018.12-dev/apache/entrypoint.sh +++ b/2018.12-dev/apache/entrypoint.sh @@ -101,7 +101,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # no downgrading possible if version_greater "$installed_version" "$image_version"; then - echo 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0 + echo 'Can'\''t copy Friendica sources because the version of the data ('$installed_version') is higher than the docker image ('$image_version')', 0 exit 1; fi fi @@ -158,10 +158,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # shellcheck disable=SC2016 install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'"' install=true - elif [ -f "/usr/src/config/local.ini.php" ]; then - echo "Installation with prepared local.ini.php" + elif [ -f "/usr/src/config/local.config.php" ]; then + echo "Installation with prepared local.config.php" - install_options="-f /usr/src/local.ini.php" + install_options="-f /usr/src/local.config.php" install=true fi @@ -174,7 +174,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled - # load other config files (*.ini.php) to the config folder (currently only local.ini.php and addon.ini.php supported) + # load other config files (*.config.php) to the config folder (currently only local.config.php and addon.config.php supported) if [ -d "/usr/src/config" ]; then rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ fi diff --git a/2018.12-dev/apache/upgrade.exclude b/2018.12-dev/apache/upgrade.exclude index 9c6c08f..b1c6486 100644 --- a/2018.12-dev/apache/upgrade.exclude +++ b/2018.12-dev/apache/upgrade.exclude @@ -5,4 +5,6 @@ /.htaccess /home.* /config/local.ini.php -/config/addon.ini.php \ No newline at end of file +/config/addon.ini.php +/config/local.config.php +/config/addon.config.php \ No newline at end of file diff --git a/2018.12-dev/fpm-alpine/cron.sh b/2018.12-dev/fpm-alpine/cron.sh index ce4d3ae..e7f96e3 100644 --- a/2018.12-dev/fpm-alpine/cron.sh +++ b/2018.12-dev/fpm-alpine/cron.sh @@ -1,7 +1,7 @@ #!/bin/sh trap "break;exit" HUP INT TERM -while [ ! -f /var/www/html/config/local.ini.php ]; do +while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do sleep 1 done diff --git a/2018.12-dev/fpm-alpine/entrypoint.sh b/2018.12-dev/fpm-alpine/entrypoint.sh index 26bd8b6..c0c86e2 100644 --- a/2018.12-dev/fpm-alpine/entrypoint.sh +++ b/2018.12-dev/fpm-alpine/entrypoint.sh @@ -101,7 +101,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # no downgrading possible if version_greater "$installed_version" "$image_version"; then - echo 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0 + echo 'Can'\''t copy Friendica sources because the version of the data ('$installed_version') is higher than the docker image ('$image_version')', 0 exit 1; fi fi @@ -158,10 +158,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # shellcheck disable=SC2016 install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'"' install=true - elif [ -f "/usr/src/config/local.ini.php" ]; then - echo "Installation with prepared local.ini.php" + elif [ -f "/usr/src/config/local.config.php" ]; then + echo "Installation with prepared local.config.php" - install_options="-f /usr/src/local.ini.php" + install_options="-f /usr/src/local.config.php" install=true fi @@ -174,7 +174,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled - # load other config files (*.ini.php) to the config folder (currently only local.ini.php and addon.ini.php supported) + # load other config files (*.config.php) to the config folder (currently only local.config.php and addon.config.php supported) if [ -d "/usr/src/config" ]; then rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ fi diff --git a/2018.12-dev/fpm-alpine/upgrade.exclude b/2018.12-dev/fpm-alpine/upgrade.exclude index 9c6c08f..b1c6486 100644 --- a/2018.12-dev/fpm-alpine/upgrade.exclude +++ b/2018.12-dev/fpm-alpine/upgrade.exclude @@ -5,4 +5,6 @@ /.htaccess /home.* /config/local.ini.php -/config/addon.ini.php \ No newline at end of file +/config/addon.ini.php +/config/local.config.php +/config/addon.config.php \ No newline at end of file diff --git a/2018.12-dev/fpm/cron.sh b/2018.12-dev/fpm/cron.sh index ce4d3ae..e7f96e3 100644 --- a/2018.12-dev/fpm/cron.sh +++ b/2018.12-dev/fpm/cron.sh @@ -1,7 +1,7 @@ #!/bin/sh trap "break;exit" HUP INT TERM -while [ ! -f /var/www/html/config/local.ini.php ]; do +while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do sleep 1 done diff --git a/2018.12-dev/fpm/entrypoint.sh b/2018.12-dev/fpm/entrypoint.sh index 26bd8b6..c0c86e2 100644 --- a/2018.12-dev/fpm/entrypoint.sh +++ b/2018.12-dev/fpm/entrypoint.sh @@ -101,7 +101,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # no downgrading possible if version_greater "$installed_version" "$image_version"; then - echo 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0 + echo 'Can'\''t copy Friendica sources because the version of the data ('$installed_version') is higher than the docker image ('$image_version')', 0 exit 1; fi fi @@ -158,10 +158,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # shellcheck disable=SC2016 install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'"' install=true - elif [ -f "/usr/src/config/local.ini.php" ]; then - echo "Installation with prepared local.ini.php" + elif [ -f "/usr/src/config/local.config.php" ]; then + echo "Installation with prepared local.config.php" - install_options="-f /usr/src/local.ini.php" + install_options="-f /usr/src/local.config.php" install=true fi @@ -174,7 +174,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled - # load other config files (*.ini.php) to the config folder (currently only local.ini.php and addon.ini.php supported) + # load other config files (*.config.php) to the config folder (currently only local.config.php and addon.config.php supported) if [ -d "/usr/src/config" ]; then rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ fi diff --git a/2018.12-dev/fpm/upgrade.exclude b/2018.12-dev/fpm/upgrade.exclude index 9c6c08f..b1c6486 100644 --- a/2018.12-dev/fpm/upgrade.exclude +++ b/2018.12-dev/fpm/upgrade.exclude @@ -5,4 +5,6 @@ /.htaccess /home.* /config/local.ini.php -/config/addon.ini.php \ No newline at end of file +/config/addon.ini.php +/config/local.config.php +/config/addon.config.php \ No newline at end of file diff --git a/2018.12-rc/apache/cron.sh b/2018.12-rc/apache/cron.sh index ce4d3ae..e7f96e3 100644 --- a/2018.12-rc/apache/cron.sh +++ b/2018.12-rc/apache/cron.sh @@ -1,7 +1,7 @@ #!/bin/sh trap "break;exit" HUP INT TERM -while [ ! -f /var/www/html/config/local.ini.php ]; do +while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do sleep 1 done diff --git a/2018.12-rc/apache/entrypoint.sh b/2018.12-rc/apache/entrypoint.sh index 26bd8b6..c0c86e2 100644 --- a/2018.12-rc/apache/entrypoint.sh +++ b/2018.12-rc/apache/entrypoint.sh @@ -101,7 +101,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # no downgrading possible if version_greater "$installed_version" "$image_version"; then - echo 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0 + echo 'Can'\''t copy Friendica sources because the version of the data ('$installed_version') is higher than the docker image ('$image_version')', 0 exit 1; fi fi @@ -158,10 +158,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # shellcheck disable=SC2016 install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'"' install=true - elif [ -f "/usr/src/config/local.ini.php" ]; then - echo "Installation with prepared local.ini.php" + elif [ -f "/usr/src/config/local.config.php" ]; then + echo "Installation with prepared local.config.php" - install_options="-f /usr/src/local.ini.php" + install_options="-f /usr/src/local.config.php" install=true fi @@ -174,7 +174,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled - # load other config files (*.ini.php) to the config folder (currently only local.ini.php and addon.ini.php supported) + # load other config files (*.config.php) to the config folder (currently only local.config.php and addon.config.php supported) if [ -d "/usr/src/config" ]; then rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ fi diff --git a/2018.12-rc/apache/upgrade.exclude b/2018.12-rc/apache/upgrade.exclude index 9c6c08f..b1c6486 100644 --- a/2018.12-rc/apache/upgrade.exclude +++ b/2018.12-rc/apache/upgrade.exclude @@ -5,4 +5,6 @@ /.htaccess /home.* /config/local.ini.php -/config/addon.ini.php \ No newline at end of file +/config/addon.ini.php +/config/local.config.php +/config/addon.config.php \ No newline at end of file diff --git a/2018.12-rc/fpm-alpine/cron.sh b/2018.12-rc/fpm-alpine/cron.sh index ce4d3ae..e7f96e3 100644 --- a/2018.12-rc/fpm-alpine/cron.sh +++ b/2018.12-rc/fpm-alpine/cron.sh @@ -1,7 +1,7 @@ #!/bin/sh trap "break;exit" HUP INT TERM -while [ ! -f /var/www/html/config/local.ini.php ]; do +while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do sleep 1 done diff --git a/2018.12-rc/fpm-alpine/entrypoint.sh b/2018.12-rc/fpm-alpine/entrypoint.sh index 26bd8b6..c0c86e2 100644 --- a/2018.12-rc/fpm-alpine/entrypoint.sh +++ b/2018.12-rc/fpm-alpine/entrypoint.sh @@ -101,7 +101,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # no downgrading possible if version_greater "$installed_version" "$image_version"; then - echo 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0 + echo 'Can'\''t copy Friendica sources because the version of the data ('$installed_version') is higher than the docker image ('$image_version')', 0 exit 1; fi fi @@ -158,10 +158,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # shellcheck disable=SC2016 install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'"' install=true - elif [ -f "/usr/src/config/local.ini.php" ]; then - echo "Installation with prepared local.ini.php" + elif [ -f "/usr/src/config/local.config.php" ]; then + echo "Installation with prepared local.config.php" - install_options="-f /usr/src/local.ini.php" + install_options="-f /usr/src/local.config.php" install=true fi @@ -174,7 +174,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled - # load other config files (*.ini.php) to the config folder (currently only local.ini.php and addon.ini.php supported) + # load other config files (*.config.php) to the config folder (currently only local.config.php and addon.config.php supported) if [ -d "/usr/src/config" ]; then rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ fi diff --git a/2018.12-rc/fpm-alpine/upgrade.exclude b/2018.12-rc/fpm-alpine/upgrade.exclude index 9c6c08f..b1c6486 100644 --- a/2018.12-rc/fpm-alpine/upgrade.exclude +++ b/2018.12-rc/fpm-alpine/upgrade.exclude @@ -5,4 +5,6 @@ /.htaccess /home.* /config/local.ini.php -/config/addon.ini.php \ No newline at end of file +/config/addon.ini.php +/config/local.config.php +/config/addon.config.php \ No newline at end of file diff --git a/2018.12-rc/fpm/cron.sh b/2018.12-rc/fpm/cron.sh index ce4d3ae..e7f96e3 100644 --- a/2018.12-rc/fpm/cron.sh +++ b/2018.12-rc/fpm/cron.sh @@ -1,7 +1,7 @@ #!/bin/sh trap "break;exit" HUP INT TERM -while [ ! -f /var/www/html/config/local.ini.php ]; do +while [ ! -f /var/www/html/config/local.ini.php ] || [ ! -f /var/www/html/config/local.config.php ]; do sleep 1 done diff --git a/2018.12-rc/fpm/entrypoint.sh b/2018.12-rc/fpm/entrypoint.sh index 26bd8b6..c0c86e2 100644 --- a/2018.12-rc/fpm/entrypoint.sh +++ b/2018.12-rc/fpm/entrypoint.sh @@ -101,7 +101,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # no downgrading possible if version_greater "$installed_version" "$image_version"; then - echo 'Can'\''t copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ('$image_version')', 0 + echo 'Can'\''t copy Friendica sources because the version of the data ('$installed_version') is higher than the docker image ('$image_version')', 0 exit 1; fi fi @@ -158,10 +158,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # shellcheck disable=SC2016 install_options=$install_options' --admin "'$FRIENDICA_ADMIN_MAIL'" --tz "'$FRIENDICA_TZ'" --lang "'$FRIENDICA_LANG'"' install=true - elif [ -f "/usr/src/config/local.ini.php" ]; then - echo "Installation with prepared local.ini.php" + elif [ -f "/usr/src/config/local.config.php" ]; then + echo "Installation with prepared local.config.php" - install_options="-f /usr/src/local.ini.php" + install_options="-f /usr/src/local.config.php" install=true fi @@ -174,7 +174,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then # TODO Workaround because of a strange permission issue rm -fr /var/www/html/view/smarty3/compiled - # load other config files (*.ini.php) to the config folder (currently only local.ini.php and addon.ini.php supported) + # load other config files (*.config.php) to the config folder (currently only local.config.php and addon.config.php supported) if [ -d "/usr/src/config" ]; then rsync $rsync_options --ignore-existing /usr/src/config/ /var/www/html/config/ fi diff --git a/2018.12-rc/fpm/upgrade.exclude b/2018.12-rc/fpm/upgrade.exclude index 9c6c08f..b1c6486 100644 --- a/2018.12-rc/fpm/upgrade.exclude +++ b/2018.12-rc/fpm/upgrade.exclude @@ -5,4 +5,6 @@ /.htaccess /home.* /config/local.ini.php -/config/addon.ini.php \ No newline at end of file +/config/addon.ini.php +/config/local.config.php +/config/addon.config.php \ No newline at end of file diff --git a/README.md b/README.md index 5033aef..46e6701 100644 --- a/README.md +++ b/README.md @@ -158,8 +158,8 @@ You have to set at least the following environment variables (others are optiona ### Using a predefined config file -You can create a `local.ini.php` and `COPY` it to `/usr/src/config`. -If no other environment variable is set, this `local.ini.php` will get copied to the config path. +You can create a `local.config.php` and `COPY` it to `/usr/src/config`. +If no other environment variable is set, this `local.config.php` will get copied to the config path. # Maintenance of the image