3 Комити d03d94daa2 ... 4216e5725e

Аутор SHA1 Порука Датум
  Philipp Fromme 4216e5725e graylog: Upgrade to 5.0 пре 1 година
  Philipp Fromme efcc12bfd4 mongodb: Set repo version by variable пре 1 година
  Philipp Fromme 74dbf64e12 Add sury php repository пре 1 година
5 измењених фајлова са 31 додато и 5 уклоњено
  1. 3 2
      graylog/init.sls
  2. 9 3
      mongodb/init.sls
  3. 14 0
      sury/init.sls
  4. BIN
      sury/sury.gpg
  5. 5 0
      sury/sury.list.tmpl

+ 3 - 2
graylog/init.sls

@@ -3,16 +3,17 @@
 #
 
 {% set graylog_config = salt['pillar.get']('logging:graylog') %}
+{% set mongodb_version = '5.0' %}
+{% include '../mongodb/init.sls' %}
 
 include:
-  - mongodb
   - elasticsearch
 
 graylog-repo:
 # add Graylog Repo
   pkgrepo.managed:
     - humanname: Graylog Repo
-    - name: deb https://packages.graylog2.org/repo/debian/ stable 4.3
+    - name: deb https://packages.graylog2.org/repo/debian/ stable 5.0
     - file: /etc/apt/sources.list.d/graylog.list
     - key_url: https://packages.graylog2.org/repo/debian/keyring.gpg
 

+ 9 - 3
mongodb/init.sls

@@ -2,12 +2,18 @@
 # mongodb
 #
 
-mongodb-repo-4.2:
+mongodb-repo:
   pkgrepo.managed:
     - humanname: MongoDB Repo
+    - file: /etc/apt/sources.list.d/mongodb-org.list
+    - key_url: https://www.mongodb.org/static/pgp/server-{{ mongodb_version }}.asc
+    {% if mongodb_version == '4.2' %}
     - name: deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main
-    - file: /etc/apt/sources.list.d/mongodb-org-4.2.list
-    - key_url: https://www.mongodb.org/static/pgp/server-4.2.asc
+    {% elif mongodb_version == '4.4' %}
+    - name: deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main
+    {% elif mongodb_version == '5.0' %}
+    - name: deb http://repo.mongodb.org/apt/debian {{ grains.oscodename }}/mongodb-org/5.0 main
+    {% endif %}
 
 mongodb:
   pkg.installed:

+ 14 - 0
sury/init.sls

@@ -0,0 +1,14 @@
+#
+# sury php
+#
+
+/etc/apt/trusted.gpg.d/deb.sury.org-php.gpg:
+  file.managed:
+    - source: salt://sury/sury.gpg
+
+/etc/apt/sources.list.d/sury.php.list:
+  file.managed:
+    - source: salt://sury/sury.list.tmpl
+    - template: jinja
+    - require:
+      - file: /etc/apt/trusted.gpg.d/deb.sury.org-php.gpg


+ 5 - 0
sury/sury.list.tmpl

@@ -0,0 +1,5 @@
+#
+# sury php repository (Salt managed)
+#
+
+deb [signed-by=/etc/apt/trusted.gpg.d/deb.sury.org-php.gpg] https://packages.sury.org/php/ {{ grains.oscodename }} main