ctucx.git: ansible-configs

update configuration

diff --git a/configuration/lollo.yml b/configuration/lollo.yml
@@ -355,10 +355,7 @@ services:
   mbusd:
     enable: true
     device: modbus0
-    baudrate: 9600
-    mode: 8n1
-    port: 502
-
+ 
   smartied:
     enable: true
     configFile: config-files/smartied.json

diff --git a/configuration/wanderduene.yml b/configuration/wanderduene.yml
@@ -118,63 +118,43 @@ services:
     acme_url: https://api.buypass.com/acme/directory
     certs:
       ctucx.de:
-        dns_names:
-          - ctucx.de
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/ctucx.de
           - sudo rc-service nginx restart
       ctu.cx:
-        dns_names:
-          - ctu.cx
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/ctu.cx
           - sudo rc-service nginx restart
       wanderduene.ctu.cx:
-        dns_names: 
-          - wanderduene.ctu.cx
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/wanderduene.ctu.cx
           - sudo rc-service nginx restart
           - sudo rc-service maddy restart
       matrix.ctu.cx:
-        dns_names:
-          - matrix.ctu.cx
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/matrix.ctu.cx
           - sudo rc-service nginx restart
       dav.ctu.cx:
-        dns_names: 
-          - dav.ctu.cx
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/dav.ctu.cx
           - sudo rc-service nginx restart
       cgit.ctu.cx:
-        dns_names:
-          - cgit.ctu.cx
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/cgit.ctu.cx
           - sudo rc-service nginx restart
       fbexporter.ctu.cx:
-        dns_names:
-          - fbexporter.ctu.cx
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/fbexporter.ctu.cx
           - sudo rc-service nginx restart
       prometheus.ctu.cx:
-        dns_names: 
-          - prometheus.ctu.cx
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/prometheus.ctu.cx
           - sudo rc-service nginx restart
       grafana.ctu.cx:
-        dns_names:
-          - grafana.ctu.cx
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/grafana.ctu.cx
           - sudo rc-service nginx restart
       pleroma.ctu.cx:
-        dns_names:
-          - pleroma.ctu.cx
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/pleroma.ctu.cx
           - sudo rc-service nginx restart

@@ -191,20 +171,14 @@ services:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/frp.ctu.cx
           - sudo rc-service nginx restart
       oeffi.ctu.cx:
-        dns_names:
-          - oeffi.ctu.cx
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/oeffi.ctu.cx
           - sudo rc-service nginx restart
       repo.f2k1.de:
-        dns_names:
-          - repo.f2k1.de
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/repo.f2k1.de
           - sudo rc-service nginx restart
       oeffisear.ch:
-        dns_names:
-          - oeffisear.ch
         renew_tasks:
           - chown -R acme-redirect:acme-redirect /var/lib/acme-redirect/live/oeffisear.ch
           - sudo rc-service nginx restart

@@ -506,7 +480,49 @@ services:
   grafana:
     enable: true
     configFile: config-files/grafana/grafana.ini
-    provisioningPath: config-files/grafana/provisioning
+    provisioning:
+      enable: true
+      dashboards: config-files/grafana/dashboards
+      datasources:
+        - name: Prometheus
+          type: prometheus
+          access: proxy
+          orgId: 1
+          url: http://127.0.0.1:9090
+          isDefault: true
+          jsonData:
+             httpMode: GET
+          version: 1
+          editable: false
+
+        - name: InfluxDB (Powermeters)
+          type: influxdb
+          access: proxy
+          orgId: 1
+          url: https://influx.home.ctu.cx
+          database: powermeters
+          basicAuth: true
+          basicAuthUser: influxdb
+          basicAuthPassword: "{{ lookup('diskcache', 'passwordstore', 'Server/lollo/passwd/home.ctu.cx/influx.plain')}}"
+          jsonData:
+             httpMode: GET
+          version: 1
+          editable: false
+
+        - name: InfluxDB (Sensors)
+          type: influxdb
+          access: proxy
+          orgId: 1
+          url: https://influx.home.ctu.cx
+          database: sensors
+          basicAuth: true
+          basicAuthUser: influxdb
+          basicAuthPassword: "{{ lookup('diskcache', 'passwordstore', 'Server/lollo/passwd/home.ctu.cx/influx.plain')}}"
+          jsonData:
+             httpMode: GET
+          version: 1
+          editable: false
+
     nginx:
       enable: true
       domain: "grafana.ctu.cx"