roles/docker/defaults/main.yml

@@ -9,59 +9,59 @@ services:
     file: postfix.yml
     domain: "smtp.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/postfix"
-    version: v3.5.1-alpine
+    version: "v3.5.1-alpine"
 
   nginx_proxy:
     file: nginx_proxy.yml
-    version: 1.0-alpine
+    version: "1.0-alpine"
     volume_folder: "{{ volume_root_folder }}/nginx"
 
   nginx_acme_companion:
-    version: 2.2
+    version: "2.2"
 
   openldap:
     file: openldap.yml
     domain: "ldap.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/openldap"
-    version: 1.5.0
+    version: "1.5.0"
 
   phpldapadmin:
-    version: 0.9.0
+    version: "0.9.0"
 
   netdata:
     file: netdata.yml
     domain: "netdata.{{ base_domain }}"
-    version: v1
+    version: "v1"
 
   portainer:
     file: portainer.yml
     domain: "portainer.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/portainer"
-    version: 2.16.2
+    version: "2.16.2"
 
   keycloak:
     file: keycloak.yml
     domain: sso.{{ base_domain }}
     volume_folder: "{{ volume_root_folder }}/keycloak"
-    version: 20.0
+    version: "20.0"
     postgres_version: 10
     allowed_sender_domain: true
 
   restic:
     file: restic_backup.yml
-    user: datacoop
+    user: "datacoop"
-    domain: restic.cannedtuna.org
+    domain: "restic.cannedtuna.org"
-    repository: datacoop-hevonen
+    repository: "datacoop-hevonen"
-    version: 1.6.0
+    version: "1.6.0"
     disabled_in_vagrant: true
 
   docker_registry:
     file: docker_registry.yml
     domain: "docker.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/docker-registry"
-    username: docker
+    username: "docker"
     password: "{{ docker_password }}"
-    version: 2
+    version: "2"
 
   ### External services ###
 
@@ -141,21 +141,21 @@ services:
   cryptohagen_website:
     file: websites/cryptohagen.dk.yml
     domains:
-      - cryptohagen.dk
+      - "cryptohagen.dk"
-      - www.cryptohagen.dk
+      - "www.cryptohagen.dk"
 
   ulovliglogning_website:
     file: websites/ulovliglogning.dk.yml
     domains:
-      - ulovliglogning.dk
+      - "ulovliglogning.dk"
-      - www.ulovliglogning.dk
+      - "www.ulovliglogning.dk"
-      - ulovlig-logning.dk
+      - "ulovlig-logning.dk"
 
   cryptoaarhus_website:
     file: websites/cryptoaarhus.dk.yml
     domains:
-      - cryptoaarhus.dk
+      - "cryptoaarhus.dk"
-      - www.cryptoaarhus.dk
+      - "www.cryptoaarhus.dk"
 
   drone:
     file: drone.yml
@@ -184,12 +184,8 @@ services:
     file: rallly.yml
     domain: "when.{{ base_domain }}"
     volume_folder: "{{ volume_root_folder }}/rallly"
-<<<<<<< HEAD
-    version: ac55701890cd866ee946deb25e2b2839fb14900e
-    postgres_version: 14-alpine
-=======
     version: e4482a1edb2fb56292d07ee8811a24f2a0d6b114
->>>>>>> main
+    postgres_version: 14-alpine
     allowed_sender_domain: true
 
   pinafore:
@@ -200,7 +196,7 @@ services:
   membersystem:
     file: membersystem.yml
     domain: "member.{{ base_domain }}"
-    django_admins: Vidir:valberg@orn.li
+    django_admins: "Vidir:valberg@orn.li"
     version: latest
     postgres_version: 13-alpine
     allowed_sender_domain: true