Merge ~jk0ne/charm-k8s-discourse/+git/discourse-k8s-image-builder:master into ~discourse-charmers/charm-k8s-discourse/+git/discourse-k8s-image-builder:master

[Jay Kuri]

use CONTAINER_APP_NAME in pod-setup exit status messaging

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Joel Sing (jsing)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 43450e9dc5d7da4a0ff94d030707212645223083

diff --git a/scripts/app_launch b/scripts/app_launch
index 87f7166..0beae97 100755
--- a/scripts/app_launch
+++ b/scripts/app_launch
@@ -4,10 +4,7 @@ cd ${CONTAINER_APP_ROOT}/app
 
 export RAILS_ENV=${DISCOURSE_RAILS_ENVIRONMENT:-production}
 export UNICORN_BIND_ALL=0.0.0.0
-
-if [ "${DISCOURSE_ENABLE_LOCAL_SIDEKIQ}" == "true" ]; then
-    export UNICORN_SIDEKIQS=1
-fi
+export UNICORN_SIDEKIQS=1
 
 # Putting the tail's in the background gets the various logs outputting to
 # stdout. The sed allows us to distinguish where a given log line comes form.
diff --git a/scripts/assets/discourse.conf.tmpl b/scripts/assets/discourse.conf.tmpl
index 4cc13b9..f1e2270 100644
--- a/scripts/assets/discourse.conf.tmpl
+++ b/scripts/assets/discourse.conf.tmpl
@@ -1,6 +1,6 @@
 hostname = $DISCOURSE_HOSTNAME 
 developer_emails = $DISCOURSE_DEVELOPER_EMAILS
-serve_static_assets = $DISCOURSE_SERVE_STATIC_ASSETS 
+serve_static_assets = true
 db_host = $DISCOURSE_POSTGRES_HOST 
 db_username = $DISCOURSE_POSTGRES_USERNAME
 db_password = $DISCOURSE_POSTGRES_PASSWORD
diff --git a/scripts/pod_start b/scripts/pod_start
index 30b80c2..fd3d95f 100755
--- a/scripts/pod_start
+++ b/scripts/pod_start
@@ -20,9 +20,9 @@ echo "Pod setup starting..."
 SETUP_EXIT=$?
 
 if [ $SETUP_EXIT -eq 0 ]; then
-    echo "Pod setup completed successfully."
+    echo "${CONTAINER_APP_NAME} setup completed successfully."
 else
-    echo "Pod setup failed with exit code: " $SETUP_EXIT
+    echo "${CONTAINER_APP_NAME} setup failed with exit code: " $SETUP_EXIT
 fi