From a6fe9f5bccbe25deee3246b366ce483a1380b053 Mon Sep 17 00:00:00 2001
From: georglauterbach <44545919+georglauterbach@users.noreply.github.com>
Date: Sun, 19 Jan 2025 10:51:51 +0100
Subject: [PATCH] chore: make permission adjustments happen on restart too

Signed-off-by: georglauterbach <44545919+georglauterbach@users.noreply.github.com>
---
 target/scripts/start-mailserver.sh    | 6 ++++--
 target/scripts/startup/setup-stack.sh | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/target/scripts/start-mailserver.sh b/target/scripts/start-mailserver.sh
index 24a07562..05a546db 100755
--- a/target/scripts/start-mailserver.sh
+++ b/target/scripts/start-mailserver.sh
@@ -122,8 +122,6 @@ function _register_functions() {
   _register_setup_function '_setup_logwatch'
 
   _register_setup_function '_setup_save_states'
-  # TODO
-  _register_setup_function '_setup_apply_fixes_after_configuration'
   _register_setup_function '_setup_adjust_state_permissions'
 
   if [[ ${ENABLE_MTA_STS} -eq 1 ]]; then
@@ -131,6 +129,9 @@ function _register_functions() {
     _register_start_daemon '_start_daemon_mta_sts_daemon'
   fi
 
+  # ! Must be the last setup function
+  _register_setup_function '_setup_directory_and_file_permissions'
+
   _register_setup_function '_setup_run_user_patches'
 
   # ? >> Daemons
@@ -191,6 +192,7 @@ if [[ -f /CONTAINER_START ]]; then
   _log 'info' 'Container was restarted. Skipping most setup routines.'
   # We cannot skip all setup routines because some need to run _after_
   # the initial setup (and hence, they cannot be moved to the check stack).
+  _setup_directory_and_file_permissions
   _setup_adjust_state_permissions
 else
   _setup
diff --git a/target/scripts/startup/setup-stack.sh b/target/scripts/startup/setup-stack.sh
index 92784dd1..789dc0c7 100644
--- a/target/scripts/startup/setup-stack.sh
+++ b/target/scripts/startup/setup-stack.sh
@@ -82,7 +82,7 @@ function _setup_timezone() {
   fi
 }
 
-function _setup_apply_fixes_after_configuration() {
+function _setup_directory_and_file_permissions() {
   _log 'trace' 'Removing leftover PID files from a stop/start'
   find /var/run/ -not -name 'supervisord.pid' -name '*.pid' -delete
   touch /dev/shm/supervisor.sock