fix(hg): add branches for noble

python · Aug 1, 2024 · 81a76b1 · 81a76b1
1 parent 8c7d314
commit 81a76b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/salt/hg/files/hg/wsgi/python.wsgi b/salt/hg/files/hg/wsgi/python.wsgi
@@ -3,4 +3,9 @@ from mercurial import encoding
 
 CONFIG = '/srv/hg/repos.conf'
 encoding.encoding = 'utf-8'
+{% if grains["oscodename"] == "noble" %}
 application = hgwebdir(CONFIG.encode())
+{% else %}
+application = hgwebdir(CONFIG)
+{% endif %}
+
diff --git a/salt/hg/init.sls b/salt/hg/init.sls
@@ -2,7 +2,9 @@ hg-deps:
   pkg.installed:
     - pkgs:
       - mercurial
+      {% if grains["oscodename"] == ["noble"] %}
       - python3-pygments
+      {% endif %}
 
 svn-deps:
   pkg.installed:
@@ -159,7 +161,7 @@ apache2:
   pkg.installed:
     - pkgs:
       - apache2
-      - libapache2-mod-wsgi-py3
+      - libapache2-mod-wsgi{% if grains["oscodename"] == ["noble"] %}-py3{% endif %}
   service.running:
     - enable: True
     - reload: True