diff --git a/CHANGELOG.md b/CHANGELOG.md index c777250..dee555b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.17.95 2024-11-25 + + ### Added + - Add APP_SINCE_WITHOUT_QUOTES_ON_FETCHING environment variable + + ## 1.17.94 2024-11-22 ### Added diff --git a/README.md b/README.md index 42756f5..c58b9ce 100644 --- a/README.md +++ b/README.md @@ -117,27 +117,28 @@ Be sure to view the following repositories to understand all the customizable op | [PHP-FPM](https://github.com/tiredofit/docker-nginx-php-fpm/) | PHP Interpreter | -| Parameter | Description | Default | `_FILE` | -| -------------------------- | ----------------------------------------------------------------------------------------------- | ----------- | ------- | -| `ADMIN_EMAIL` | Administrator Email Address - Needed for logging in | | x | -| `ADMIN_FIRST_NAME` | Admin user First Name | `Admin` | x | -| `ADMIN_LAST_NAME` | Admin user First Name | `User` | x | -| `ADMIN_PASS` | Administrator Password - Needed for Logging in | | x | -| `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_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` | | -| `DB_HOST` | Host or container name of the Databse Server e.g. `freescout-db` | | x | -| `DB_PORT` | Database Port e.g.`3306` for mysql, `5432` for postgres | `3306` | x | -| `DB_NAME` | Database name e.g. `freescout` | | x | -| `DB_USER` | Username for above Database e.g. `freescout` | | x | -| `DB_PASS` | Password for above Database e.g. `password` | | x | -| `DISPLAY_ERRORS` | Display Errors on Website | `FALSE` | | -| `ENABLE_AUTO_UPDATE` | If coming from an earlier version of image, automatically update it to latest Freescout release | `TRUE` | | -| `SETUP_TYPE` | Automatically edit configuration after first bootup `AUTO` or `MANUAL` | `AUTO` | | -| `SITE_URL` | The url your site listens on example `https://freescout.example.com` | | | +| Parameter | Description | Default | `_FILE` | +| -------------------------------------- | ----------------------------------------------------------------------------------------------- | ----------- | ------- | +| `ADMIN_EMAIL` | Administrator Email Address - Needed for logging in | | x | +| `ADMIN_FIRST_NAME` | Admin user First Name | `Admin` | x | +| `ADMIN_LAST_NAME` | Admin user First Name | `User` | x | +| `ADMIN_PASS` | Administrator Password - Needed for Logging in | | x | +| `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_SINCE_WITHOUT_QUOTES_ON_FETCHING` | Allow to disable quotes around SINCE date in IMAP search | `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` | | +| `DB_HOST` | Host or container name of the Databse Server e.g. `freescout-db` | | x | +| `DB_PORT` | Database Port e.g.`3306` for mysql, `5432` for postgres | `3306` | x | +| `DB_NAME` | Database name e.g. `freescout` | | x | +| `DB_USER` | Username for above Database e.g. `freescout` | | x | +| `DB_PASS` | Password for above Database e.g. `password` | | x | +| `DISPLAY_ERRORS` | Display Errors on Website | `FALSE` | | +| `ENABLE_AUTO_UPDATE` | If coming from an earlier version of image, automatically update it to latest Freescout release | `TRUE` | | +| `SETUP_TYPE` | Automatically edit configuration after first bootup `AUTO` or `MANUAL` | `AUTO` | | +| `SITE_URL` | The url your site listens on example `https://freescout.example.com` | | | ### Networking diff --git a/install/assets/defaults/30-freescout b/install/assets/defaults/30-freescout index 9c61dbb..e7664a5 100755 --- a/install/assets/defaults/30-freescout +++ b/install/assets/defaults/30-freescout @@ -3,6 +3,7 @@ ADMIN_FIRST_NAME=${ADMIN_FIRST_NAME:-"Admin"} ADMIN_LAST_NAME=${ADMIN_LAST_NAME:-"User"} APPLICATION_NAME=${APPLICATION_NAME:-"FreeScout"} +APP_SINCE_WITHOUT_QUOTES_ON_FETCHING=${APP_SINCE_WITHOUT_QUOTES_ON_FETCHING:-"FALSE"} 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 d8649db..c6db6b6 100755 --- a/install/etc/cont-init.d/30-freescout +++ b/install/etc/cont-init.d/30-freescout @@ -155,6 +155,12 @@ if grep -q "APP_URL" "${NGINX_WEBROOT}"/.env > /dev/null 2>&1; then else sed -i --follow-symlinks "s#APP_X_FRAME_OPTIONS=.*#APP_X_FRAME_OPTIONS=${APP_X_FRAME_OPTIONS}#g" "${NGINX_WEBROOT}"/.env fi + + if ! grep -q "APP_SINCE_WITHOUT_QUOTES_ON_FETCHING" "${NGINX_WEBROOT}"/.env > /dev/null 2>&1; then + echo "APP_SINCE_WITHOUT_QUOTES_ON_FETCHING=${APP_SINCE_WITHOUT_QUOTES_ON_FETCHING}" | sudo -u "${NGINX_USER}" tee -a "${NGINX_WEBROOT}"/.env + else + sed -i --follow-symlinks "s#APP_SINCE_WITHOUT_QUOTES_ON_FETCHING=.*#APP_SINCE_WITHOUT_QUOTES_ON_FETCHING=${APP_SINCE_WITHOUT_QUOTES_ON_FETCHING}#g" "${NGINX_WEBROOT}"/.env + fi else print_info "Skipping Auto configuration and using in place .env" fi