From 0a7e5bcdcd49e5546fe02377993b26e81151af17 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Thu, 3 Jun 2021 18:27:45 +0200
Subject: [PATCH] move default values to libs/defaults

---
 bundles/telegraf/items.py | 8 ++++----
 groups/os.py              | 8 +-------
 libs/defaults.py          | 6 ++++++
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 libs/defaults.py

diff --git a/bundles/telegraf/items.py b/bundles/telegraf/items.py
index 4f7e12c..dc3cbab 100644
--- a/bundles/telegraf/items.py
+++ b/bundles/telegraf/items.py
@@ -47,10 +47,10 @@ telegraf_config = {
     },
     'outputs': {
         'influxdb_v2': [{
-            'urls': [node.metadata['telegraf']['influxdb_url']],
-            'token': node.metadata['telegraf']['influxdb_token'],
-            'organization': node.metadata['telegraf']['influxdb_org'],
-            'bucket': node.metadata['telegraf']['influxdb_bucket'],
+            'urls': [node.metadata.get('telegraf/influxdb_url', repo.libs.defaults.influxdb_url)],
+            'token': node.metadata.get('telegraf/influxdb_token', repo.vault.decrypt(repo.libs.defaults.influxdb_token)),
+            'organization': node.metadata.get('telegraf/influxdb_org', repo.vault.decrypt(repo.libs.defaults.influxdb_org)),
+            'bucket': node.metadata.get('telegraf/influxdb_bucket', repo.vault.decrypt(repo.libs.defaults.influxdb_bucket)),
         }],
     },
 }
diff --git a/groups/os.py b/groups/os.py
index 36b237c..d98356b 100644
--- a/groups/os.py
+++ b/groups/os.py
@@ -33,7 +33,7 @@ groups['linux'] = {
     'metadata': {
         'apt': {
             'unattended-upgrades': {
-                'mail': 'hostmaster@kunsmann.eu',
+                'mail': libs.defaults.hostmaster_email,
             },
         },
         'backup-client': {
@@ -49,12 +49,6 @@ groups['linux'] = {
                 },
             },
         },
-        'telegraf': {
-            'influxdb_url': 'https://influxdb.kunsmann.eu/',
-            'influxdb_token': vault.decrypt('encrypt$gAAAAABgg9Ag632Xyuc6SWXaR1uH2tLOChmVKAoBIikhjntSSD2qJFL_eouVQGXCLH2HEuSbSdEXcTPn2qmhOiA9jmFdoDSbVbQUsp0EID1wLsWYG_Um2KOxZSF-tn9eDZlgShQYySjzO3nQRmdlJpVLUnGHsiwv_sHD2FstXGpfzTPZq5_egUqEc0K2X-aN2J6BTYc2fZAN'),
-            'influxdb_org': vault.decrypt('encrypt$gAAAAABgg9hyjz4XtvG8NBw9uYxiumS3v7YKIrtc9tTTABg1f9R22gzn55q8ULP9X3wlsPMUQs_DH7CgGv9neYmvVAriRoyd8g=='),
-            'influxdb_bucket': vault.decrypt('encrypt$gAAAAABgg9iMnq0nKpODMiMN4NtUw231iqpbyDXV-O8epOAGDSL4jcf3CaSa2bLZzH2fJFaKWjW-dpVd384x6KqSQU19XpfsWA=='),
-        },
     },
     'pip_command': 'pip3',
 }
diff --git a/libs/defaults.py b/libs/defaults.py
new file mode 100644
index 0000000..771c014
--- /dev/null
+++ b/libs/defaults.py
@@ -0,0 +1,6 @@
+hostmaster_email = 'hostmaster@kunbox.net'
+
+influxdb_bucket = 'encrypt$gAAAAABgg9iMnq0nKpODMiMN4NtUw231iqpbyDXV-O8epOAGDSL4jcf3CaSa2bLZzH2fJFaKWjW-dpVd384x6KqSQU19XpfsWA=='
+influxdb_org = 'encrypt$gAAAAABgg9hyjz4XtvG8NBw9uYxiumS3v7YKIrtc9tTTABg1f9R22gzn55q8ULP9X3wlsPMUQs_DH7CgGv9neYmvVAriRoyd8g=='
+influxdb_token = 'encrypt$gAAAAABgg9Ag632Xyuc6SWXaR1uH2tLOChmVKAoBIikhjntSSD2qJFL_eouVQGXCLH2HEuSbSdEXcTPn2qmhOiA9jmFdoDSbVbQUsp0EID1wLsWYG_Um2KOxZSF-tn9eDZlgShQYySjzO3nQRmdlJpVLUnGHsiwv_sHD2FstXGpfzTPZq5_egUqEc0K2X-aN2J6BTYc2fZAN'
+influxdb_url = 'https://influxdb.kunsmann.eu/'