Make timezone variable, default to America/Denver

Halfwalker · Feb 29, 2024 · 846f9d8 · 846f9d8
1 parent 9b83966
commit 846f9d8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -9,6 +9,9 @@ force_update: false
 # Shall we install drone and drone-runner as well ?
 enable_drone: true
 
+# Default timezone - mainly for systemd service files
+timezone: 'America/Denver'
+
 # Shall we install the act runner and enable it ?
 enable_act: true
 # What version to install

diff --git a/templates/drone-runner.service.j2 b/templates/drone-runner.service.j2
@@ -25,7 +25,7 @@ ExecStartPre=/usr/bin/docker pull drone/drone-runner-docker:latest
 {% endif %}
 
 ExecStart=/usr/bin/docker run --rm --name drone-runner{% if lookup('env', 'MOLECULE_SCENARIO_NAME') %}-ubuntu-{{ ansible_distribution_release }}{% endif%} \
-    -e TZ=America/New_York \
+    -e TZ={{ timezone }} \
 {% if not lookup('env', 'MOLECULE_SCENARIO_NAME') %}
     --env-file "{% for dataset in gitea_datasets %}{% if dataset.name == 'gitea' %}{{ dataset.mountpoint }}{{ gitea_drone_env_file }}{% endif %}{% endfor %}" \
 {% else %}

diff --git a/templates/drone.service.j2 b/templates/drone.service.j2
@@ -23,7 +23,7 @@ ExecStartPre=/usr/bin/docker pull drone/drone:latest
 {% endif %}
 
 ExecStart=/usr/bin/docker run --rm --name drone{% if lookup('env', 'MOLECULE_SCENARIO_NAME') %}-ubuntu-{{ ansible_distribution_release }}{% endif%} \
-    -e TZ=America/New_York \
+    -e TZ={{ timezone }} \
 {% if not lookup('env', 'MOLECULE_SCENARIO_NAME') %}
     --env-file "{% for dataset in gitea_datasets %}{% if dataset.name == 'gitea' %}{{ dataset.mountpoint }}{{ gitea_drone_env_file }}{% endif %}{% endfor %}" \
     --env-file "{% for dataset in gitea_datasets %}{% if dataset.name == 'gitea' %}{{ dataset.mountpoint }}{{ gitea_admin_token_file }}{% endif %}{% endfor %}" \

diff --git a/templates/gitea.service.j2 b/templates/gitea.service.j2
@@ -37,7 +37,7 @@ ExecStartPre=/usr/bin/docker pull gitea/gitea:latest
     container.
 #}
 ExecStart=/usr/bin/docker run --rm --name gitea{% if lookup('env', 'MOLECULE_SCENARIO_NAME') %}-ubuntu-{{ ansible_distribution_release }}{% endif %} \
-    -e TZ=America/New_York \
+    -e TZ={{ timezone }}\
     -e USER_UID={{ getent_passwd['git'][1] }} \
     -e USER_GID={{ getent_passwd['git'][2] }} \
     -p {{ gitea_container_port }}:3000 \