Skip to content

Commit e77444e

Browse files
authored
fix(hg): fix git conflict mess again (#438)
1 parent c848f65 commit e77444e

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

salt/hg/init.sls

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,17 @@ hg-user:
5959
- require:
6060
- user: hg-user
6161

62-
{% if grains["oscodename"] == "noble" %}
63-
/srv/hg/wsgi/python3.wsgi:
64-
file.managed:
65-
- source: salt://hg/files/hg/wsgi/python3.wsgi
66-
- user: hg
67-
- mode: "0755"
68-
- require:
69-
- file: /srv/hg/wsgi
70-
{% else %}
7162
/srv/hg/wsgi/python.wsgi:
7263
file.managed:
73-
- source: salt://hg/files/hg/wsgi/python.wsgi
7464
- user: hg
7565
- mode: "0755"
7666
- require:
7767
- file: /srv/hg/wsgi
78-
{% endif %}
68+
{% if grains["oscodename"] == "noble" %}
69+
- source: salt://hg/files/hg/wsgi/python3.wsgi
70+
{% else %}
71+
- source: salt://hg/files/hg/wsgi/python.wsgi
72+
{% endif %}
7973

8074
/srv/hg/src:
8175
file.recurse:

0 commit comments

Comments
 (0)