ctucx.git: ansible-configs

My personal ansible roles and playbooks

commit 73b59b75c0b894b34ebdcd9e5ea44e8a116e41a1
parent 9c230bce7324afe11e145ae4e7f8123c6e7ddc3e
Author: Leah (ctucx) <leah@ctu.cx>
Date: Sat, 27 Feb 2021 15:07:54 +0100

update configuration
2 files changed, 56 insertions(+), 45 deletions(-)
M
configuration/lollo.yml
|
66
+++++++++++++++++++++++++++++++-----------------------------------
M
configuration/wanderduene.yml
|
35
+++++++++++++++++++++++++----------
diff --git a/configuration/lollo.yml b/configuration/lollo.yml
@@ -20,6 +20,7 @@ system:
   users:
     - name: leah
       groups: "wheel"
+      shell: /usr/bin/bash
       password: "{{ lookup('diskcache', 'passwordstore', 'Server/leah.password')}}"
       allowedSshKeys:
         - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCw/G6x8H3ojvHx3NsTswBMMmOhp48F3rea0GUniKSvRLMRIti5b7Q4P4FXnkQEtuNSR3u7gE5r4EacaLaIx7Az9SgHRoE+hdzSo4mPAwKTx/E3HZgIjdZhTDL8PAn4SZZT6RBqr/uGb+x9fdIjY0FbdNBLjq0MNnG3T+qd1joUL8JXoS7F//ac52RhHlsA5qJXFDOhpqR/7hRMwOFNH0GKaLN1xQKcOjhpIcdswpOf8kRDVpT7xOYwfXCFF4MaY2M8047WKarvEnGdADIIw6bvWsdJINehtOQmYEFRaMuaWp1d9bglZXZKPQKNubv5lqneMP4AI7ImDYjgW6eNLIT1 cardno:000603502829

@@ -253,6 +254,7 @@ services:
     enable: true
     local_service: true
     no_resolv: true
+    no_hosts: true
     domain_needed: true
     bogus_priv: true
     expand_hosts: false

@@ -351,18 +353,11 @@ services:
     nginx:
       enable: true
       domain: "influx.home.ctu.cx"
-      enableBasicAuth: true
-      basicAuthFileContent: "{{ lookup('diskcache', 'passwordstore', 'Server/{{system.hostname}}/passwd/home.ctu.cx/influx returnall=true')}}"
       sslOnly: true
       ssl:
         enable: true
         cert: "/var/lib/acme-redirect/live/influx.home.ctu.cx/fullchain"
         privkey: "/var/lib/acme-redirect/live/influx.home.ctu.cx/privkey"
-    databases: 
-      - powermeters
-      - sensors
-      - test_powermeters
-      - test_sensors
 
   mosquitto:
     enable: true

@@ -477,40 +472,40 @@ services:
           deviceName: ikea_remote
           actions:
             toggle:
-              type: SwitchStateAction
-              deviceName: modbus-10
-              relay: 0
-              toggle: true
+              - type: SwitchStateAction
+                deviceName: modbus-10
+                relay: 0
+                toggle: true
             toggle_hold:
-              type: SwitchStateAction
-              deviceName: modbus-10
-              relay: 2
-              toggle: true
+              - type: SwitchStateAction
+                deviceName: modbus-10
+                relay: 2
+                toggle: true
             arrow_left_click:
-              type: SwitchStateAction
-              deviceName: modbus-10
-              relay: 1
-              toggle: true
+              - type: SwitchStateAction
+                deviceName: modbus-10
+                relay: 1
+                toggle: true
             arrow_right_click:
-              type: SwitchStateAction
-              deviceName: modbus-10
-              relay: 3
-              toggle: true
+              - type: SwitchStateAction
+                deviceName: modbus-10
+                relay: 3
+                toggle: true
             brightness_up_click:
-              type: SwitchStateAction
-              deviceName: modbus-20
-              relay: 0
-              toggle: true
+              - type: SwitchStateAction
+                deviceName: modbus-20
+                relay: 0
+                toggle: true
             brightness_down_click:
-              type: SwitchStateAction
-              deviceName: modbus-20
-              relay: 2
-              toggle: true
+              - type: SwitchStateAction
+                deviceName: modbus-20
+                relay: 2
+                toggle: true
             brightness_down_hold:
-              type: SwitchStateAction
-              deviceName: modbus-20
-              relay: 3
-              toggle: true
+              - type: SwitchStateAction
+                deviceName: modbus-20
+                relay: 3
+                toggle: true
         lacrosse-raum:
           type: LacrosseTempSensor
           id: '21'

@@ -620,6 +615,7 @@ services:
         influx:
           host: 10.0.0.1
           port: 8086
+          authToken: "{{ lookup('diskcache', 'passwordstore', 'Server/lollo/influx/smartied.token')}}"
           powermetersDatabase: powermeters
           sensorsDatabase: sensors
         powermeterUpdateIntervalSec: 20
diff --git a/configuration/wanderduene.yml b/configuration/wanderduene.yml
@@ -499,12 +499,19 @@ services:
           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')}}"
+#          secureJsonData:
+#            token: "{{ lookup('diskcache', 'passwordstore', 'Server/lollo/influx/smartied.token')}}"
+#          jsonData:
+#            version: Flux
+#            organization: organization
+#            defaultBucket: bucket
+#            tlsSkipVerify: true
           jsonData:
-             httpMode: GET
-          version: 1
+            httpMode: GET
+            httpHeaderName1: "Authorization"
+          secureJsonData:
+            httpHeaderValue1: "Token {{ lookup('diskcache', 'passwordstore', 'Server/lollo/influx/smartied.token')}}"
+          version: 3
           editable: false
 
         - name: InfluxDB (Sensors)

@@ -513,12 +520,20 @@ services:
           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')}}"
+          database: powermeters
+#          secureJsonData:
+#            token: "{{ lookup('diskcache', 'passwordstore', 'Server/lollo/influx/smartied.token')}}"
+#          jsonData:
+#            version: Flux
+#            organization: organization
+#            defaultBucket: bucket
+#            tlsSkipVerify: true
           jsonData:
-             httpMode: GET
-          version: 1
+            httpMode: GET
+            httpHeaderName1: "Authorization"
+          secureJsonData:
+            httpHeaderValue1: "Token {{ lookup('diskcache', 'passwordstore', 'Server/lollo/influx/smartied.token')}}"
+          version: 3
           editable: false
 
     nginx: