From 98ef28aa09ccbfef222c59ca5992caf9000d21f0 Mon Sep 17 00:00:00 2001
From: Stefano Fancello <gentoo.stefano@gmail.com>
Date: Mon, 5 May 2025 12:28:48 +0200
Subject: [PATCH 1/2] fix(import): Make sure customer card volume has correct
 permission on migration

Avoid errors when volumes are initialized and freepbx container entrypoint try to set asterisk ownership to /etc/nethcti and /var/lib/nethserver/nethcti/templates/customer_card volumes.
---
 imageroot/actions/import-module/04initialize_volumes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/imageroot/actions/import-module/04initialize_volumes b/imageroot/actions/import-module/04initialize_volumes
index 6716aaa4b..9f43891bd 100755
--- a/imageroot/actions/import-module/04initialize_volumes
+++ b/imageroot/actions/import-module/04initialize_volumes
@@ -14,5 +14,7 @@ podman run \
     --volume=asterisk:/etc/asterisk:z \
     --volume=sounds:/var/lib/asterisk/sounds:z \
     --volume=agi-bin:/var/lib/asterisk/agi-bin:z \
+    --volume=nethcti:/etc/nethcti:z \
+    --volume=customer_card:/var/lib/nethserver/nethcti/templates/customer_card/:z \
     "${NETHVOICE_FREEPBX_IMAGE}" \
     echo "volumes initialized"

From 90ef2d9f56ec10c89d8d731089fc9c97ddb7d33d Mon Sep 17 00:00:00 2001
From: Stefano Fancello <gentoo.stefano@gmail.com>
Date: Mon, 5 May 2025 12:32:25 +0200
Subject: [PATCH 2/2] fix(init): don't attempt to run initialization scripts if
 database isn't configured

Freepbx configuration scripts needs database configured. Avoid errors when container is launched by import-module
---
 freepbx/entrypoint.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/freepbx/entrypoint.sh b/freepbx/entrypoint.sh
index 3d30fbc6b..08ed2d35d 100755
--- a/freepbx/entrypoint.sh
+++ b/freepbx/entrypoint.sh
@@ -92,6 +92,18 @@ EOF
 mkdir -p /var/spool/asterisk/outgoing /var/spool/asterisk/tmp /var/spool/asterisk/uploads 
 chown asterisk:asterisk /var/lib/asterisk/db /var/spool/asterisk/outgoing /var/spool/asterisk/tmp /var/spool/asterisk/uploads /var/lib/nethserver/nethcti/templates/customer_card
 
+# Make sure config dir is writable from nethcti and freepbx containers
+chown -R asterisk:asterisk /etc/nethcti
+
+# make sure CSV upload path exists if /var/lib/nethvoice isn't a volume or already initialized
+mkdir -p /var/lib/nethvoice/phonebook/uploads
+chown -R asterisk:asterisk /var/lib/nethvoice/phonebook/uploads
+
+# Don't continue with initialization if the database is not ready
+if [[ -z "${AMPDBUSER}" || -z "${AMPDBPASS}" ]]; then
+	exit 0
+fi
+
 # Customized wizard page
 cat > /etc/apache2/sites-available/wizard.conf <<EOF
 AliasMatch ^/(?!freepbx)(.+)$ /var/www/html/freepbx/wizard/\$1
@@ -236,13 +248,6 @@ fi
 # Configure users
 php /configure_users.php
 
-# Make sure config dir is writable from nethcti and freepbx containers
-chown -R asterisk:asterisk /etc/nethcti
-
-# make sure CSV uopload path exists if /var/lib/nethvoice isn't a volume or already initialized
-mkdir -p /var/lib/nethvoice/phonebook/uploads
-chown -R asterisk:asterisk /var/lib/nethvoice/phonebook/uploads
-
 # Change Apache httpd port
 sed -i "s/<VirtualHost \*:80>/<VirtualHost \*:${APACHE_PORT}>/" /etc/apache2/sites-enabled/000-default.conf
 sed -i "s/Listen 80/Listen ${APACHE_PORT}/" /etc/apache2/ports.conf