ctucx.git: ansible-configs

dnsmasq: fix up some stuff

diff --git a/configuration/taurus.yml b/configuration/taurus.yml
@@ -149,7 +149,7 @@ services:
     nginx:
       enable: true
       domain: "restic.ctu.cx"
-      password: "{{ lookup('diskcache', 'community.general.passwordstore', 'server/taurus/rest-server.htpasswd returnall=true') }}"
+      password: "{{ lookup('diskcache', 'community.general.passwordstore', 'Server/taurus/rest-server.htpasswd returnall=true') }}"
       sslOnly: true
       ssl:
         enable: true

diff --git a/configuration/wanderduene.yml b/configuration/wanderduene.yml
@@ -287,7 +287,7 @@ services:
   radicale:
     enable: true
     configFile: config-files/radicale/config
-    users: "{{ lookup('diskcache', 'community.general.passwordstore', 'server/wanderduene/radicale.users returnall=true')}}"
+    users: "{{ lookup('diskcache', 'community.general.passwordstore', 'Server/wanderduene/radicale.users returnall=true')}}"
     nginx:
       enable: true
       domain: "dav.ctu.cx"

@@ -380,7 +380,7 @@ services:
   pleroma:
     enable: true
     configFile: config-files/pleroma/config.exs
-    secretsContent: "{{ lookup('diskcache', 'community.general.passwordstore', 'server/{{system.hostname}}/pleroma.secrets returnall=true')}}"
+    secretsContent: "{{ lookup('diskcache', 'community.general.passwordstore', 'Server/{{system.hostname}}/pleroma.secrets returnall=true')}}"
     nginx:
       enable: true
       domain: "pleroma.ctu.cx"

@@ -392,7 +392,7 @@ services:
 
   frps:
     enable: true
-    token: "{{ lookup('diskcache', 'community.general.passwordstore', 'server/wanderduene/frps/token returnall=true')}}"
+    token: "{{ lookup('diskcache', 'community.general.passwordstore', 'Server/wanderduene/frps/token returnall=true')}}"
     port: 5050
     vhostDomain: "frp.ctu.cx"
     vhostPort: 8088

diff --git a/roles/dnsmasq/templates/dnsmasq.conf.j2 b/roles/dnsmasq/templates/dnsmasq.conf.j2
@@ -42,21 +42,25 @@ quiet-ra
 server={{ dns_server }}
 {% endfor %}
 
+
+
 {% if services.dnsmasq.domain is defined %}
 # allow /etc/hosts and dhcp lookups for local domains
 local=/{{ services.dnsmasq.domain }}/
 domain={{ services.dnsmasq.domain }}
 {% endif %}
 
-{% if services.dnsmasq.auth_zone is defined %}
-{% for auth_zone in services.dnsmasq.auth_zone %}
-auth-zone={{ auth_zone }}
-{% endfor %}
+{% if services.dnsmasq.auth_ttl is defined %}
+auth-ttl={{ services.dnsmasq.auth_ttl }}
 {% endif %}
 
-{% if services.dnsmasq.local_addresses is defined %}
-{% for address in services.dnsmasq.local_addresses %}
-address={{ address }}
+{% if services.dnsmasq.auth_server is defined %}
+auth-server={{ services.dnsmasq.auth_server }}
+{% endif %}
+
+{% if services.dnsmasq.auth_zones is defined %}
+{% for auth_zone in services.dnsmasq.auth_zones %}
+auth-zone={{ auth_zone }}
 {% endfor %}
 {% endif %}
 

@@ -66,8 +70,16 @@ host-record={{ address }}
 {% endfor %}
 {% endif %}
 
+{% if services.dnsmasq.local_addresses is defined %}
+{% for address in services.dnsmasq.local_addresses %}
+address={{ address }}
+{% endfor %}
+{% endif %}
+
+
 
 {% if services.dnsmasq.dhcp is defined %}
+
 {% if services.dnsmasq.dhcp.authoritative is defined and services.dnsmasq.dhcp.authoritative is true  %}
 dhcp-authoritative
 {% endif %}