Skip to content

Commit 8c7d314

Browse files
authored
feat(hg): working hg on noble (#403)
* feat(hg): working hg on noble * feat(hg): working hg on noble * chore(hg): default vagrant to noble
1 parent 741a759 commit 8c7d314

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

Vagrantfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SERVERS = [
1010
{:name => "consul", :codename => "jammy"},
1111
"docs",
1212
"downloads",
13-
"hg",
13+
{:name => "hg", :codename => "noble"},
1414
{:name => "loadbalancer", :ports => [20000, 20001, 20002, 20003, 20004, 20005, 20010, 20011]},
1515
"mail",
1616
"moin",

salt/hg/config/repos.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ git = 1
66
showfunc = 1
77

88
[web]
9-
llow_archive = gz, zip, bz2
9+
allow_archive = gz, zip, bz2
1010
collapse = True
1111
contact = -
1212
descend = True

salt/hg/files/hg/wsgi/python.wsgi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ from mercurial import encoding
33

44
CONFIG = '/srv/hg/repos.conf'
55
encoding.encoding = 'utf-8'
6-
application = hgwebdir(CONFIG)
6+
application = hgwebdir(CONFIG.encode())

salt/hg/init.sls

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ hg-deps:
22
pkg.installed:
33
- pkgs:
44
- mercurial
5+
- python3-pygments
56

67
svn-deps:
78
pkg.installed:
@@ -158,7 +159,7 @@ apache2:
158159
pkg.installed:
159160
- pkgs:
160161
- apache2
161-
- libapache2-mod-wsgi
162+
- libapache2-mod-wsgi-py3
162163
service.running:
163164
- enable: True
164165
- reload: True

0 commit comments

Comments
 (0)