Release 1.17.110 - See CHANGELOG.md

Author: tiredofit

Diff for: CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.17.110 2025-03-06 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add DB_SSL (default FALSE) environment variable to allow accomodate for MariaDB client defaulting to want to connect to SSL enabled host
+
+   ### Changed
+      - Rework SKIP_STORAGE_PERMISSIONS check introduced in last release to a TRUE/FALSE option
+
+
 ## 1.17.109 2025-03-04 <glyras@github>
 
    ### Added

Diff for: README.md

@@ -135,11 +135,12 @@ Be sure to view the following repositories to understand all the customizable op
 | `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       |
+| `DB_SSL` | Used to enable SSL support for MySQL and MariaDB databases | `FALSE` | |
 | `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`                            |             |         |
-| `SKIP_STORAGE_PERMISSIONS`             | Skip applying permission to storage path, e.g. for instances involving large storage paths      |             |         |
+| `SKIP_STORAGE_PERMISSIONS`             | Skip applying permission to storage path, e.g. for instances involving large storage paths      | `FALSE`            |         |
 
 
 ### Networking

Diff for: install/assets/defaults/30-freescout

@@ -8,5 +8,7 @@ APP_X_FRAME_OPTIONS=${APP_X_FRAME_OPTIONS:-"TRUE"}
 DB_PGSQL_SSL_MODE=${DB_PGSQL_SSL_MODE:-"prefer"}
 DB_PORT=${DB_PORT:-3306}
 DB_TYPE=${DB_TYPE:-"mysql"}
+DB_SSL=${DB_SSL:-"FALSE"}
 ENABLE_AUTO_UPDATE=${ENABLE_AUTO_UPDATE:-"TRUE"}
-SETUP_TYPE=${SETUP_TYPE:-"AUTO"}
+SETUP_TYPE=${SETUP_TYPE:-"AUTO"}
+SKIP_STORAGE_PERMISSIONS=${SKIP_STORAGE_PERMISSIONS:-"FALSE"}

Diff for: install/etc/cont-init.d/30-freescout

@@ -243,10 +243,18 @@ silent sudo -u "${NGINX_USER}" php artisan storage:link
 
 ### Check to see if DB is populated
 if [ "${DB_TYPE}" = "mysql" ]; then
-  mysql -u $DB_USER -p$DB_PASS -h$DB_HOST -P$DB_PORT -e "use "$DB_NAME"; SELECT * FROM users;" > /dev/null 2>&1
+    case "${DB_SSL,,}" in
+        true )
+            _mysql_ssl="--ssl"
+        ;;
+        false )
+            _mysql_ssl="--skip-ssl"
+        ;;
+    esac
+    mysql ${_mysql_ssl} -u$DB_USER -p$DB_PASS -h$DB_HOST -P$DB_PORT -e "use "$DB_NAME"; SELECT * FROM users;" > /dev/null 2>&1
 elif [ "${DB_TYPE,,}" = "pgsql" ] || [ "${DB_TYPE,,}" = "postgres" ]; then
-  export PGPASSWORD="${DB_PASS}"
-  psql --dbname=postgresql://$DB_USER@$DB_HOST:$DB_PORT/$DB_NAME -c "SELECT * FROM users;" > /dev/null 2>&1
+    export PGPASSWORD="${DB_PASS}"
+    psql --dbname=postgresql://$DB_USER@$DB_HOST:$DB_PORT/$DB_NAME -c "SELECT * FROM users;" > /dev/null 2>&1
 fi
 
 if [ $? -gt 0 ]; then
@@ -272,10 +280,11 @@ fi
 cd "${NGINX_WEBROOT}"
 chown -R "${NGINX_USER}":"${NGINX_GROUP}" bootstrap/cache public/css/builds public/js/builds
 chmod -R ug+rwx bootstrap/cache public/css/builds public/js/builds
-if [ -z ${SKIP_STORAGE_PERMISSIONS} ]; then
+if var_false "${SKIP_STORAGE_PERMISSIONS}" ; then
   chown -R "${NGINX_USER}":"${NGINX_GROUP}" storage
   chmod -R ug+rwx storage
 fi
+
 chown -R "${NGINX_USER}":"${NGINX_GROUP}" "${NGINX_WEBROOT}"
 chmod ug+rwx "${NGINX_WEBROOT}"