diff --git a/Vagrantfile b/Vagrantfile index d91a3cb7..261d7f89 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,7 +10,7 @@ SERVERS = [ {:name => "consul", :codename => "jammy"}, "docs", "downloads", - "hg", + {:name => "hg", :codename => "noble"}, {:name => "loadbalancer", :ports => [20000, 20001, 20002, 20003, 20004, 20005, 20010, 20011]}, "mail", "moin", diff --git a/salt/hg/config/repos.conf b/salt/hg/config/repos.conf index 52c4b52c..5836b595 100644 --- a/salt/hg/config/repos.conf +++ b/salt/hg/config/repos.conf @@ -6,7 +6,7 @@ git = 1 showfunc = 1 [web] -llow_archive = gz, zip, bz2 +allow_archive = gz, zip, bz2 collapse = True contact = - descend = True diff --git a/salt/hg/files/hg/wsgi/python.wsgi b/salt/hg/files/hg/wsgi/python.wsgi index b1eb056d..5632caaf 100644 --- a/salt/hg/files/hg/wsgi/python.wsgi +++ b/salt/hg/files/hg/wsgi/python.wsgi @@ -3,4 +3,4 @@ from mercurial import encoding CONFIG = '/srv/hg/repos.conf' encoding.encoding = 'utf-8' -application = hgwebdir(CONFIG) +application = hgwebdir(CONFIG.encode()) diff --git a/salt/hg/init.sls b/salt/hg/init.sls index fe4cc1de..22f739b7 100644 --- a/salt/hg/init.sls +++ b/salt/hg/init.sls @@ -2,6 +2,7 @@ hg-deps: pkg.installed: - pkgs: - mercurial + - python3-pygments svn-deps: pkg.installed: @@ -158,7 +159,7 @@ apache2: pkg.installed: - pkgs: - apache2 - - libapache2-mod-wsgi + - libapache2-mod-wsgi-py3 service.running: - enable: True - reload: True