From e4be3b952a38f31ea6fffcd669a15833abd59984 Mon Sep 17 00:00:00 2001
From: Jacob Coffee <jacob@z7x.org>
Date: Thu, 11 Jul 2024 11:39:06 -0500
Subject: [PATCH 1/3] feat(hg): working hg on noble

---
 salt/hg/config/repos.conf         | 6 +++---
 salt/hg/files/hg/wsgi/python.wsgi | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/salt/hg/config/repos.conf b/salt/hg/config/repos.conf
index 52c4b52c..9ce46f3e 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
@@ -15,5 +15,5 @@ logourl = https://hg.python.org
 pygments_style = default
 style = hgpythonorg
 
-[extensions]
-hgext.highlight =
+; [extensions]
+; hgext.highlight =
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())

From 7f1ba0d3c522787bf94f88cbf65c622eb24716c6 Mon Sep 17 00:00:00 2001
From: Jacob Coffee <jacob@z7x.org>
Date: Thu, 25 Jul 2024 12:59:30 -0500
Subject: [PATCH 2/3] feat(hg): working hg on noble

---
 salt/hg/config/repos.conf | 4 ++--
 salt/hg/init.sls          | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/salt/hg/config/repos.conf b/salt/hg/config/repos.conf
index 9ce46f3e..5836b595 100644
--- a/salt/hg/config/repos.conf
+++ b/salt/hg/config/repos.conf
@@ -15,5 +15,5 @@ logourl = https://hg.python.org
 pygments_style = default
 style = hgpythonorg
 
-; [extensions]
-; hgext.highlight =
+[extensions]
+hgext.highlight =
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

From 063cc730f4311a4ab1b9bceed5c22c4a8b9cb878 Mon Sep 17 00:00:00 2001
From: Jacob Coffee <jacob@z7x.org>
Date: Thu, 25 Jul 2024 13:10:01 -0500
Subject: [PATCH 3/3] chore(hg): default vagrant to noble

---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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",