2 Achegas 3109dffb24 ... 1ea0d959e7

Autor SHA1 Mensaxe Data
  Philipp Fromme 1ea0d959e7 influxdb: Switch to new repo key hai 1 ano
  Philipp Fromme 8d9174fd3a influxdb: Use user instead of owner hai 1 ano
Modificáronse 3 ficheiros con 16 adicións e 8 borrados
  1. BIN=BIN
      influxdb/influxdata-archive_compat.gpg
  2. 5 0
      influxdb/influxdb.list.tmpl
  3. 11 8
      influxdb/init.sls

BIN=BIN
influxdb/influxdata-archive_compat.gpg


+ 5 - 0
influxdb/influxdb.list.tmpl

@@ -0,0 +1,5 @@
+#
+# influxdb deb repo
+#
+
+deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian {{ grains.oscodename }} stable

+ 11 - 8
influxdb/init.sls

@@ -2,16 +2,19 @@
 # influxdb
 #
 influxdb:
-  pkgrepo.managed:
-    - humanname: InfluxDB-Repo
-    - name: deb https://repos.influxdata.com/debian buster stable
-    - key_url:  https://repos.influxdata.com/influxdb.key
-    - dist: buster
-    - file: /etc/apt/sources.list.d/influxdb.list
+  file.managed:
+    - names:
+      - /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg:
+        - source: salt://influxdb/influxdata-archive_compat.gpg
+      - /etc/apt/sources.list.d/influxdb.list:
+        - source: salt://influxdb/influxdb.list.tmpl
+        - template: jinja
+        - require:
+          - file: /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg
   pkg.installed:
     - name: influxdb
     - require:
-      - pkgrepo: influxdb
+      - file: /etc/apt/sources.list.d/influxdb.list
   service.running:
     - name: influxdb
     - enable: True
@@ -39,7 +42,7 @@ influxdb:
   file.managed:
     - source: salt://influxdb/backup.sh
     - mode: 700
-    - owner: influxdb
+    - user: influxdb
 
 /etc/cron.d/backup-influx:
   file.managed: