From 253f698beaf09052de6ad87bf7d4aa17582c3ded Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Tue, 12 Dec 2023 10:30:52 -0800
Subject: [PATCH] Release 1.17.47 - See CHANGELOG.md

---
 CHANGELOG.md                         | 11 +++++++++++
 install/assets/defaults/30-freescout |  2 +-
 install/etc/cont-init.d/30-freescout |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df3abfe..32a0300 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.17.47 2023-12-12 <dave at tiredofit dot ca>
+
+PHP 7.4 and PHP 8.0 variants have been dropped
+arm/v7 support has been removed
+PHP 8.3 variant is available with this release
+
+   ### Changed
+      - Fix to 'unknown command' upon startup #152
+      - Resolve default naming for APP_X_FRAME_OPTIONS
+
+
 ## 1.17.46 2023-12-08 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/install/assets/defaults/30-freescout b/install/assets/defaults/30-freescout
index 31b5407..831f6cc 100755
--- a/install/assets/defaults/30-freescout
+++ b/install/assets/defaults/30-freescout
@@ -4,7 +4,7 @@ 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:-"FALSE"}
-APP_X_FRAME_OPTIONS=:-"TRUE"}
+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"}
diff --git a/install/etc/cont-init.d/30-freescout b/install/etc/cont-init.d/30-freescout
index bcdb195..d9fb2ee 100755
--- a/install/etc/cont-init.d/30-freescout
+++ b/install/etc/cont-init.d/30-freescout
@@ -230,7 +230,7 @@ fi
 
 ## Removals
 # 1.8.78
-sed -i --follow-symlinks "APP_FORCE_HTTP=/d" "${NGINX_WEBROOT}"/.env
+sed -i --follow-symlinks "/APP_FORCE_HTTP=/d" "${NGINX_WEBROOT}"/.env
 
 ### Cleanup
 cd "${NGINX_WEBROOT}"/