Merge branch 'main' into fix-hg-pre-noble

python · Aug 1, 2024 · 3c7a463 · 3c7a463
2 parents 6e0fe25 + 103da72
commit 3c7a463
Showing 1 changed file with 38 additions and 0 deletions.
diff --git a/salt/hg/init.sls b/salt/hg/init.sls
@@ -58,6 +58,44 @@ hg-user:
     - file_mode: "0755"
     - require:
       - user: hg-user
+    - exclude_pat:
+      - python*.wsgi
+
+{% if grains["oscodename"] == "noble" %}
+/srv/hg/wsgi/python3.wsgi:
+  file.managed:
+    - source: salt://hg/files/hg/wsgi/python3.wsgi
+    - user: hg
+    - mode: "0755"
+    - require:
+      - file: /srv/hg/wsgi
+{% else %}
+/srv/hg/wsgi/python.wsgi:
+  file.managed:
+    - source: salt://hg/files/hg/wsgi/python.wsgi
+    - user: hg
+    - mode: "0755"
+    - require:
+      - file: /srv/hg/wsgi
+{% endif %}
+
+{% if grains["oscodename"] == "noble" %}
+/srv/hg/wsgi/python.wsgi:
+  file.managed:
+    - source: salt://hg/files/hg/wsgi/python3.wsgi
+    - user: hg
+    - mode: "0755"
+    - require:
+      - file: /srv/hg/wsgi
+{% else %}
+/srv/hg/wsgi/python.wsgi:
+  file.managed:
+    - source: salt://hg/files/hg/wsgi/python.wsgi
+    - user: hg
+    - mode: "0755"
+    - require:
+      - file: /srv/hg/wsgi
+{% endif %}
 
 /srv/hg/wsgi/python.wsgi:
   file.managed: