Updated runn-locally.sh and fixed config generation

mailcow · Sep 14, 2022 · 2de468e · 2de468e
1 parent 98fb52d
commit 2de468e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 2 deletions.
diff --git a/changelogs/v1.7.0.md b/changelogs/v1.7.0.md
@@ -0,0 +1,4 @@
+# v1.7.0
+
+## Ansible
+- Updated for GitHub actions
diff --git a/changelogs/v1.7.1.md b/changelogs/v1.7.1.md
@@ -0,0 +1,7 @@
+# v1.7.1
+
+## Ansible
+- Set mailcow branch variable for generate config task
+
+## Scripts
+- Updated run-locally.sh with better error handling for zero input
diff --git a/roles/mailcow/defaults/main/main.yml b/roles/mailcow/defaults/main/main.yml
@@ -3,4 +3,4 @@
 mailcow__git_repo: https://github.com/mailcow/mailcow-dockerized.git
 mailcow__git_version: master
 
-timezone_selection: Europe/Berlin
+mailcow__timezone: Europe/Berlin
diff --git a/roles/mailcow/tasks/main.yml b/roles/mailcow/tasks/main.yml
@@ -39,7 +39,8 @@
   shell: ./generate_config.sh
   environment:
     MAILCOW_HOSTNAME: "{{ mailcow__hostname }}"
-    MAILCOW_TZ: "{{ timezone_selection }}"
+    MAILCOW_TZ: "{{ mailcow__timezone }}"
+    MAILCOW_BRANCH: "{{ mailcow__git_version }}"
   args:
     executable: /bin/bash
     chdir: /opt/mailcow-dockerized

diff --git a/run-locally.sh b/run-locally.sh
@@ -2,6 +2,14 @@
 
 PHASE=$1
 
+if [ -z $PHASE ]; then
+    echo "Please select a phase:"
+    echo "setup"
+    echo "tests"
+    echo "teardown"
+    exit 1
+fi
+
 if [ $PHASE == "setup" ]; then
     ansible-playbook mailcow-start-server.yml --diff
     sleep 10