fix nginx repo for jammy

python · Jan 19, 2024 · e1aa7d6 · e1aa7d6
1 parent 3020f2d
commit e1aa7d6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/salt/nginx/config/APT-GPG-KEY-NGINX b/salt/nginx/config/APT-GPG-KEY-NGINX
@@ -1,5 +1,4 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.22 (GNU/Linux)
 
 mQENBE5OMmIBCAD+FPYKGriGGf7NqwKfWC83cBV01gabgVWQmZbMcFzeW+hMsgxH
 W6iimD0RsfZ9oEbfJCPG0CRSZ7ppq5pKamYs2+EJ8Q2ysOFHHwpGrA2C8zyNAs4I
@@ -14,15 +13,12 @@ KoYoXWcdxaFjlXGTt6jV85qRguUzvMOxxSEM2Dn115etN9piPl0Zz+4rkx8+2vJG
 F+eMlruPXg/zd88NvyLq5gGHEsFRBMVufYmHtNfcp4okC1klWiRIRSdp4QY1wdrN
 1O+/oCTl8Bzy6hcHjLIq3aoumcLxMjtBoclc/5OTioLDwSDfVx7rWyfRhcBzVbwD
 oe/PD08AoAA6fxXvWjSxy+dGhEaXoTHjkCbz/l6NxrK3JFyauDgU4K4MytsZ1HDi
-MgMW8hZXxszoICTTiQEcBBABAgAGBQJOTkelAAoJEKZP1bF62zmo79oH/1XDb29S
-YtWp+MTJTPFEwlWRiyRuDXy3wBd/BpwBRIWfWzMs1gnCjNjk0EVBVGa2grvy9Jtx
-JKMd6l/PWXVucSt+U/+GO8rBkw14SdhqxaS2l14v6gyMeUrSbY3XfToGfwHC4sa/
-Thn8X4jFaQ2XN5dAIzJGU1s5JA0tjEzUwCnmrKmyMlXZaoQVrmORGjCuH0I0aAFk
-RS0UtnB9HPpxhGVbs24xXZQnZDNbUQeulFxS4uP3OLDBAeCHl+v4t/uotIad8v6J
-SO93vc1evIje6lguE81HHmJn9noxPItvOvSMb2yPsE8mH4cJHRTFNSEhPW6ghmlf
-Wa9ZwiVX5igxcvaIRgQQEQIABgUCTk5b0gAKCRDs8OkLLBcgg1G+AKCnacLb/+W6
-cflirUIExgZdUJqoogCeNPVwXiHEIVqithAM1pdY/gcaQZmIRgQQEQIABgUCTk5f
-YQAKCRCpN2E5pSTFPnNWAJ9gUozyiS+9jf2rJvqmJSeWuCgVRwCcCUFhXRCpQO2Y
-Va3l3WuB+rgKjsQ=
-=EWWI
+MgMW8hZXxszoICTTiQE+BBMBAgAoBQJOTjJiAhsDBQkJZgGABgsJCAcDAgYVCAIJ
+CgsEFgIDAQIeAQIXgAAKCRCr9b2Ce9m/YpvjB/98uV4t94d0oEh5XlqEZzVMrcTg
+PQ3BZt05N5xVuYaglv7OQtdlErMXmRWaFZEqDaMHdniCsF63jWMd29vC4xpzIfms
+LK3ce9oYo4t9o4WWqBUdf0Ff1LMz1dfLG2HDtKPfYg3C8NESud09zuP5NohaE8Qz
+j/4p6rWDiRpuZ++4fnL3Dt3N6jXILwr/TM/Ma7jvaXGPDO3kzm4dNKp5b5bn2nT2
+QWLPnEKxvOg5Zoej8l9+KFsUnXoWoYCkMQ2QTpZQFNwFxwJGoAz8K3PwVPUrIL6b
+1lsiNovDgcgP0eDgzvwLynWKBPkRRjtgmWLoeaS9FAZVccXJMmANXJFuCf26
+=MGIK
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/salt/nginx/init.sls b/salt/nginx/init.sls
@@ -1,16 +1,28 @@
+{% if grains["oscodename"] == "jammy" %}
+nginxkey:
+  file.managed:
+    - name: /etc/apt/keyrings/nginx.asc
+    - mode: "0644"
+    - source: salt://nginx/config/APT-GPG-KEY-NGINX
+
 nginx:
   pkgrepo.managed:
-    {% if grains["oscodename"] == "jammy" %}
-    - name: deb [signed-by=/etc/apt/keyrings/nginx.gpg arch={{ grains["osarch"] }}] http://nginx.org/packages/ubuntu {{ grains.oscodename }} nginx
+    - name: deb [signed-by=/etc/apt/keyrings/nginx.asc arch={{ grains["osarch"] }}] https://nginx.org/packages/ubuntu {{ grains.oscodename }} nginx
     - aptkey: False
-    {% else %}
+    - file: /etc/apt/sources.list.d/nginx.list
+    - require:
+      - file: nginxkey
+    - require_in:
+      - pkg: nginx
+{% else %}
+nginx:
+  pkgrepo.managed:
     - name: deb http://nginx.org/packages/ubuntu {{ grains.oscodename }} nginx
-    {% endif %}
     - file: /etc/apt/sources.list.d/nginx.list
     - key_url: salt://nginx/config/APT-GPG-KEY-NGINX
-    - order: 2
     - require_in:
       - pkg: nginx
+{% endif %}
 
   user.present:
     - system: True