From 56596b9e3fc6058fffe3a43d868423019424e7fe Mon Sep 17 00:00:00 2001
From: Philipp Rothmann <philipprothmann@posteo.de>
Date: Thu, 23 Mar 2023 11:40:58 +0100
Subject: [PATCH] fix stuff

---
 entrypoint.sh | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 77246ea..89c46d4 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -29,7 +29,7 @@ file_env "CIVICRM_SITE_KEY"
 file_env "CIVICRM_CRED_KEYS"
 file_env "SMTP_PASSWORD"
 
-until mysql -e '\q' -h db -p"${WORDPRESS_DB_PASS}" && mysql -e '\q' -h db-civicrm -p"${CIVICRM_DB_PASS}"; do
+until mysql -e '\q' -h db -p"${WORDPRESS_DB_PASS}" && mysql -e '\q' -h "${CIVICRM_DB_HOST}" -p"${CIVICRM_DB_PASS}"; do
   echo "Waiting for db container to come up"
   sleep 1
 done;
@@ -44,37 +44,40 @@ su civicrm -c "wp language core activate de_DE"
 
 
 if ! [[ -d /var/www/html/wp-content/plugins/civicrm/civicrm/l10n ]]; then
-  echo "=== Running Civicrm Docker Install"
+  echo "=== Moving Civicrm L10n"
   pushd /var/www/html/wp-content/plugins/civicrm/
     mkdir -p civicrm/l10n
     cp -r l10n/de_DE civicrm/l10n
     cp -r sql/civicrm_acl.de_DE.mysql civicrm/sql/civicrm_acl.de_DE.mysql
     cp -r sql/civicrm_data.de_DE.mysql civicrm/sql/civicrm_data.de_DE.mysql
     chown -R civicrm:civicrm civicrm/l10n civicrm/sql
-
-
   popd
-  rm -rf /var/www/html/wp-content/uploads/civicrm/civicrm.settings.php
-  su civicrm -c "wp plugin activate civicrm"
+fi
 
-  # TODO: extract module and extension stuff to .env
-  su civicrm -c "cv core:install -vv --keep --db=mysql://$CIVICRM_DB_USER:$CIVICRM_DB_PASS@$CIVICRM_DB_HOST:$CIVICRM_DB_PORT/$CIVICRM_DB_NAME --lang de_DE --comp CiviEvent,CiviMember"
+if ! [[ -f /var/www/html/wp-content/uploads/civicrm/is_installed ]]; then
+  pushd /var/www/html/wp-content/uploads/civicrm/
+    echo "=== Running Civicrm Docker Install"
+    touch is_installed
+    rm -rf civicrm.settings.php
+    su civicrm -c "wp plugin activate civicrm"
+
+    # TODO: extract module and extension stuff to .env
+    su civicrm -c "cv core:install -vv --keep --db=mysql://$CIVICRM_DB_USER:$CIVICRM_DB_PASS@$CIVICRM_DB_HOST:$CIVICRM_DB_PORT/$CIVICRM_DB_NAME --lang de_DE --comp CiviEvent,CiviMember"
 
-  pushd /var/www/html/wp-content/uploads/civicrm
     mv civicrm.settings.php civicrm.settings.php.generated
     cp /usr/local/etc/civicrm/civicrm.settings.php civicrm.settings.php
     chmod a-wx /var/www/html/wp-content/uploads/civicrm/civicrm.settings.php
-    chown civicrm:civicrm ./*
+    chown -R civicrm:civicrm templates_c
   popd
 else
   echo "=== Running Civicrm Upgrade"
   echo "=== well, not yet"
-  # TODO:
-  # run dump backup
-  # check version specifig upgrade steps: https://docs.civicrm.org/sysadmin/en/latest/upgrade/version-specific/
-  # run upgrade
-  #  cv flush
+  # TODO: Should we run a upgrade here?
+  # * run dump backup
+  # * check version specifig upgrade steps: https://docs.civicrm.org/sysadmin/en/latest/upgrade/version-specific/
+  # * run upgrade
+  # * cv flush
 fi
 
-echo "=== Running Apache2"
+echo "=== Running Webserver"
 exec apache2-foreground
\ No newline at end of file