diff --git a/README.md b/README.md index 2aa0dc2..3da97c9 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e DB_HOST=` | for specifying the database host | | `-e DB_USER=` | for specifying the database user | | `-e DB_PASS=` | for specifying the database password | -| `-e DB_DATABASE=bookstackapp` | for specifying the database to be used | +| `-e DB_DATABASE=bookstackapp` | for specifying the database to be used (non-alphanumeric passwords must be properly escaped.) | | `-v /config` | this will store any uploaded data on the docker host | ## Environment variables from files (Docker secrets) @@ -271,6 +271,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.10.22:** - Remove password escape logic which caused problems for a small subset of users. * **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). * **14.03.22:** - Add symlinks for theme support. * **11.07.21:** - Rebase to Alpine 3.14. diff --git a/package_versions.txt b/package_versions.txt index f8f5e11..2dbda91 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,9 +12,9 @@ ca-certificates-20220614-r0 ca-certificates-bundle-20220614-r0 coreutils-9.0-r2 curl-7.80.0-r3 -dbus-libs-1.12.20-r4 +dbus-libs-1.12.24-r0 encodings-1.0.5-r0 -expat-2.4.7-r0 +expat-2.4.9-r0 fontconfig-2.13.1-r4 freetype-2.11.1-r2 gdbm-1.22-r0 diff --git a/readme-vars.yml b/readme-vars.yml index 8a60f65..fbe9593 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -30,7 +30,7 @@ param_env_vars: - { env_var: "DB_PORT", env_value: "", desc: "for specifying the database port if not default 3306" } - { env_var: "DB_USER", env_value: "", desc: "for specifying the database user" } - { env_var: "DB_PASS", env_value: "", desc: "for specifying the database password" } - - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used" } + - { env_var: "DB_DATABASE", env_value: "bookstackapp", desc: "for specifying the database to be used (non-alphanumeric passwords must be properly escaped.)" } param_usage_include_ports: true param_ports: @@ -103,6 +103,7 @@ app_setup_block: | # changelog changelogs: + - { date: "10.10.22:", desc: "Remove password escape logic which caused problems for a small subset of users." } - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." } - { date: "14.03.22:", desc: "Add symlinks for theme support." } - { date: "11.07.21:", desc: "Rebase to Alpine 3.14." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 4171f9d..e52e78c 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,11 +1,11 @@ -## Version 2022/08/20 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2022/10/04 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server; listen [::]:80 default_server; - listen 443 ssl http2; - listen [::]:443 ssl http2; + listen 443 ssl http2 default_server; + listen [::]:443 ssl http2 default_server; server_name _; diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index e4d3725..3a9ebea 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -63,11 +63,10 @@ fi if [ "${DB_USER}" ]; then echo "Running config - db_user set" - ESCAPED_PASSWORD=$(sed -E 's/('\'')/\\\1/g' <<< $DB_PASS) sed -i "s/^DB_HOST=.*/DB_HOST=${DB_HOST}/g" /config/www/.env sed -i "s/^DB_DATABASE=.*/DB_DATABASE=${DB_DATABASE}/g" /config/www/.env sed -i "s/^DB_USERNAME=.*/DB_USERNAME=${DB_USER}/g" /config/www/.env - sed -i "s/^DB_PASSWORD=.*/DB_PASSWORD=${ESCAPED_PASSWORD}/g" /config/www/.env + sed -i "s/^DB_PASSWORD=.*/DB_PASSWORD=${DB_PASS}/g" /config/www/.env if [ -n "${DB_PORT}" ]; then if ! grep -xq "^DB_PORT=.*" /config/www/.env; then