From 5045873034bf382e09e841e1145e850a334d4ccf Mon Sep 17 00:00:00 2001
From: James Henstridge <james@jamesh.id.au>
Date: Wed, 9 Aug 2023 18:34:06 +0800
Subject: [PATCH 1/4] bootstrap.yml: change python-apt to python3-apt

---
 bootstrap.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootstrap.yml b/bootstrap.yml
index 2c1af55..140184b 100644
--- a/bootstrap.yml
+++ b/bootstrap.yml
@@ -33,7 +33,7 @@
     apt:
       name:
         - ansible
-        - python-apt
+        - python3-apt
         - git
       state: latest
 

From 569f91e8f067124c6b02e66810cbf73b5cbf92b9 Mon Sep 17 00:00:00 2001
From: James Henstridge <james@jamesh.id.au>
Date: Wed, 9 Aug 2023 19:14:02 +0800
Subject: [PATCH 2/4] site.yml: initial Debian 12 changes

---
 site.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/site.yml b/site.yml
index 3aabcfe..bc12fe3 100644
--- a/site.yml
+++ b/site.yml
@@ -51,11 +51,11 @@
       mode: 0700
       recurse: yes
 
-  - name: Apt - enable stretch-backports
+  - name: Apt - enable bookworm-backports
     apt_repository:
-      repo: "deb http://mirrors.digitalocean.com/debian stretch-backports main contrib non-free"
+      repo: "deb http://mirrors.digitalocean.com/debian bookworm-backports main contrib non-free"
       state: present
-      filename: stretch-backports
+      filename: bookworm-backports
       update_cache: yes
 
   #role:dns-servers
@@ -92,13 +92,12 @@
     apt: name=certbot state=latest
 
   - name: Install certbot nginx plugin
-    apt: name=python-certbot-nginx state=latest
+    apt: name=python3-certbot-nginx state=latest
 
   - name: Install certbot DNS RFC2136 plugin
     apt:
       name: python3-certbot-dns-rfc2136
       state: present
-      default_release: stretch-backports
 
   - name: Create certbot secrets and config folder
     file:
@@ -164,17 +163,16 @@
       mode: 0600
 
   #role:plug-website
-  # jekyll install disabled temporarily until we move to buster
-  #  - name: Install jekyll
-  #    apt: name=jekyll state=latest
+  - name: Install Hugo
+    apt: name=hugo state=latest
 
   - name: Use Git to checkout latest plug website
     git: version="master" repo="https://github.com/plugorgau/plugorgau.github.io.git" dest="/home/glass/plugorgau.github.io/"
     become_user: glass
     register: plug_website_git
 
-  - name: Use Jekyll to build plug website
-    shell: "jekyll build"
+  - name: Use Hugo to build plug website
+    shell: "hugo -d ./_site"
     args: 
       chdir: /home/glass/plugorgau.github.io/
     become_user: glass
@@ -239,7 +237,7 @@
 
   #role:php
   - name: PHP - Install php-fpm
-    apt: name=php7.0-fpm
+    apt: name=php-fpm
     # TODO Configure php-fpm
 
   #role:ugmm
@@ -247,7 +245,7 @@
     apt: name=smarty3 state=latest
 
   - name: UGMM - Install LDAP PHP module
-    apt: name=php7.0-ldap state=latest
+    apt: name=php-ldap state=latest
     # TODO nginx cofig
     # TODO php pool?
 

From dc4988f3b93ce5c5daa39ac43c526fbfe708fdf3 Mon Sep 17 00:00:00 2001
From: James Henstridge <james@jamesh.id.au>
Date: Wed, 9 Aug 2023 19:58:16 +0800
Subject: [PATCH 3/4] site.yml: install rsync, as it is needed by the website
 deploy script

---
 site.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/site.yml b/site.yml
index bc12fe3..48219b1 100644
--- a/site.yml
+++ b/site.yml
@@ -29,6 +29,7 @@
       - pv
       - time
       - devscripts
+      - rsync
 
   - name: Set timezone
     timezone:

From e826627fdef9784e89319b7dda126290c71f7f4f Mon Sep 17 00:00:00 2001
From: James Henstridge <james@jamesh.id.au>
Date: Tue, 18 Jun 2024 22:12:08 +0800
Subject: [PATCH 4/4] Add the Debian Buster repo so we can install Python 2 and
 Mailman 2.

Update the spamassassin task to deal with configuration file change and
systemd unit name change.
---
 site.yml                    | 5 +++++
 spamassassin/tasks/main.yml | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/site.yml b/site.yml
index 48219b1..3db029d 100644
--- a/site.yml
+++ b/site.yml
@@ -297,6 +297,11 @@
     notify: start icecast
 
   #role:mailman
+  - name: Mailman - Enable Debian Buster repo for Python 2 packages
+    apt_repository:
+      repo: deb http://ftp.au.debian.org/debian buster main
+      filename: buster
+
   - name: Mailman - Install Mailman and fcgiwrap
     apt: name={{ item }} state=latest
     with_items:
diff --git a/spamassassin/tasks/main.yml b/spamassassin/tasks/main.yml
index 326771d..fd12c05 100644
--- a/spamassassin/tasks/main.yml
+++ b/spamassassin/tasks/main.yml
@@ -19,11 +19,12 @@
 - name: Enable SpamAssassin nightly cron
   lineinfile:
     dest: /etc/default/spamassassin
+    create: true
     regexp: '^CRON='
     line: CRON=1
 
 - name: Enable and start SpamAssassin service
   systemd:
-    name: spamassassin
+    name: spamd
     enabled: yes
     state: started