From 934b9b64c77702fc1958d25ab1804f688f77e20a Mon Sep 17 00:00:00 2001
From: Sheppy <sheppy@atlantishq.de>
Date: Thu, 5 Jan 2023 20:22:30 +0100
Subject: [PATCH] update: restart always & async icinga conf

---
 .../templates/async-icinga-config.json.j2            | 12 +++++-------
 roles/docker-deployments/templates/async-icinga.yaml |  1 +
 roles/docker-deployments/templates/athq-landing.yaml |  1 +
 roles/docker-deployments/templates/grafana.yaml      |  1 +
 roles/docker-deployments/templates/potaris-en.yaml   |  1 +
 roles/docker-deployments/templates/potaris.yaml      |  1 +
 roles/docker-deployments/templates/sector32.yaml     |  1 +
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/roles/docker-deployments/templates/async-icinga-config.json.j2 b/roles/docker-deployments/templates/async-icinga-config.json.j2
index 37d6ef5..c7f2abe 100644
--- a/roles/docker-deployments/templates/async-icinga-config.json.j2
+++ b/roles/docker-deployments/templates/async-icinga-config.json.j2
@@ -1,10 +1,8 @@
-[
+{ 
 {% for service in async_icinga_static_services %}
-    { 
-        "{{ service['name'] }}" : {
-            "timeout" : "{{ service['timeout'] }}",
-            "token"   : "{{ service['token'] }}"
-        }
+    "{{ service['name'] }}" : {
+        "timeout" : "{{ service['timeout'] }}",
+        "token"   : "{{ service['token'] }}"
     }{% if not loop.last %},{% endif %}
 {% endfor %}
-]
+}
diff --git a/roles/docker-deployments/templates/async-icinga.yaml b/roles/docker-deployments/templates/async-icinga.yaml
index 0ae2c2b..923485a 100644
--- a/roles/docker-deployments/templates/async-icinga.yaml
+++ b/roles/docker-deployments/templates/async-icinga.yaml
@@ -1,6 +1,7 @@
 async-icinga:
     volumes:
         - "/data/async-icinga/:/app/config"
+    restart: always
     ports:
         - 5006:5000
     image: registry.atlantishq.de/athq/async-icinga
diff --git a/roles/docker-deployments/templates/athq-landing.yaml b/roles/docker-deployments/templates/athq-landing.yaml
index 28e54a7..fa5da5e 100644
--- a/roles/docker-deployments/templates/athq-landing.yaml
+++ b/roles/docker-deployments/templates/athq-landing.yaml
@@ -2,3 +2,4 @@ athqlanding:
     ports:
         - 5002:5000
     image: registry.atlantishq.de/athq/landing-page
+    restart: always
diff --git a/roles/docker-deployments/templates/grafana.yaml b/roles/docker-deployments/templates/grafana.yaml
index 144dda8..1499e3c 100644
--- a/roles/docker-deployments/templates/grafana.yaml
+++ b/roles/docker-deployments/templates/grafana.yaml
@@ -2,6 +2,7 @@ grafana:
     ports:
         - 3000:3000
     image: grafana/grafana-oss
+    restart: always
     volumes:
         - "/var/grafana:/var/lib/grafana"
     environment:
diff --git a/roles/docker-deployments/templates/potaris-en.yaml b/roles/docker-deployments/templates/potaris-en.yaml
index 759a6a2..a03ee8c 100644
--- a/roles/docker-deployments/templates/potaris-en.yaml
+++ b/roles/docker-deployments/templates/potaris-en.yaml
@@ -2,3 +2,4 @@ potaris:
     ports:
         - 5004:5000
     image: registry.atlantishq.de/athq/fjsd-potaris-en
+    restart: always
diff --git a/roles/docker-deployments/templates/potaris.yaml b/roles/docker-deployments/templates/potaris.yaml
index c170821..8a9a042 100644
--- a/roles/docker-deployments/templates/potaris.yaml
+++ b/roles/docker-deployments/templates/potaris.yaml
@@ -2,3 +2,4 @@ potaris:
     ports:
         - 5003:5000
     image: registry.atlantishq.de/athq/fjsd-potaris
+    restart: always
diff --git a/roles/docker-deployments/templates/sector32.yaml b/roles/docker-deployments/templates/sector32.yaml
index 93bfcae..08e68c6 100644
--- a/roles/docker-deployments/templates/sector32.yaml
+++ b/roles/docker-deployments/templates/sector32.yaml
@@ -2,3 +2,4 @@ sector32:
     ports:
         - 5001:5000
     image: registry.atlantishq.de/athq/sector32
+    restart: always