diff --git a/CHANGELOG.md b/CHANGELOG.md index 9946c28..c777250 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## 1.17.94 2024-11-22 + + ### Added + - Free Scout 1.8.158 + + ### Changed + - Remove APP_NEW_FETCHING_LIBRARY environment variable + + ## 1.17.93 2024-11-15 ### Added diff --git a/Dockerfile b/Dockerfile index 9e32f05..e13ea44 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ LABEL maintainer="Dave Conroy (github.com/tiredofit)" ARG FREESCOUT_VERSION -ENV FREESCOUT_VERSION=${FREESCOUT_VERSION:-"1.8.157"} \ +ENV FREESCOUT_VERSION=${FREESCOUT_VERSION:-"1.8.158"} \ FREESCOUT_REPO_URL=https://github.com/freescout-helpdesk/freescout \ NGINX_WEBROOT=/www/html \ NGINX_SITE_ENABLED=freescout \ diff --git a/README.md b/README.md index 2f14409..42756f5 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,6 @@ Be sure to view the following repositories to understand all the customizable op | `APPLICATION_NAME` | Change default application name - Default `Freescout` | `freescout` | | | `APP_PROXY` | Allow Application to use a proxy for fetching modules | | | | `APP_TRUSTED_PROXIES` | Comma separated list of trusted proxies, i.e. `192.168.1.1,192.168.1.2,192.168.1.3` | | | -| `APP_NEW_FETCHING_LIBRARY` | Sets FreeScout's new_fetching_library config option | `FALSE` | | | `APP_X_FRAME_OPTIONS` | Allow to embed via iframes `TRUE` `FALSE` `DENY` `ALLOW FROM example.org` | `TRUE` | `DB_TYPE` | Type of the Database. Currently supported are `mysql` and `pgsql` | `mysql` | | | `DB_PGSQL_SSL_MODE` | Postgresql TLS Mode | `prefer` | | diff --git a/install/assets/defaults/30-freescout b/install/assets/defaults/30-freescout index 5c7acbf..9c61dbb 100755 --- a/install/assets/defaults/30-freescout +++ b/install/assets/defaults/30-freescout @@ -3,7 +3,6 @@ ADMIN_FIRST_NAME=${ADMIN_FIRST_NAME:-"Admin"} ADMIN_LAST_NAME=${ADMIN_LAST_NAME:-"User"} APPLICATION_NAME=${APPLICATION_NAME:-"FreeScout"} -APP_NEW_FETCHING_LIBRARY=${APP_NEW_FETCHING_LIBRARY:-"TRUE"} APP_X_FRAME_OPTIONS=${APP_X_FRAME_OPTIONS:-"TRUE"} DB_PGSQL_SSL_MODE=${DB_PGSQL_SSL_MODE:-"prefer"} DB_PORT=${DB_PORT:-3306} diff --git a/install/etc/cont-init.d/30-freescout b/install/etc/cont-init.d/30-freescout index 200e4df..d8649db 100755 --- a/install/etc/cont-init.d/30-freescout +++ b/install/etc/cont-init.d/30-freescout @@ -150,13 +150,6 @@ if grep -q "APP_URL" "${NGINX_WEBROOT}"/.env > /dev/null 2>&1; then sed -i --follow-symlinks "s#APP_PROXY=.*#APP_PROXY=${APP_PROXY}#g" "${NGINX_WEBROOT}"/.env fi - # Implement new_fetching_library config option - if ! grep -q "APP_NEW_FETCHING_LIBRARY" "${NGINX_WEBROOT}"/.env > /dev/null 2>&1; then - echo "APP_NEW_FETCHING_LIBRARY=${APP_NEW_FETCHING_LIBRARY,,}" | sudo -u "${NGINX_USER}" tee -a "${NGINX_WEBROOT}"/.env - else - sed -i --follow-symlinks "s#APP_NEW_FETCHING_LIBRARY=.*#APP_NEW_FETCHING_LIBRARY=${APP_NEW_FETCHING_LIBRARY,,}#g" "${NGINX_WEBROOT}"/.env - fi - if ! grep -q "APP_X_FRAME_OPTIONS" "${NGINX_WEBROOT}"/.env > /dev/null 2>&1; then echo "APP_X_FRAME_OPTIONS=${APP_X_FRAME_OPTIONS}" | sudo -u "${NGINX_USER}" tee -a "${NGINX_WEBROOT}"/.env else