Merge branch 'support-bookworm-jammy' into develop

mysociety · Jan 8, 2024 · 3658be0 · 3658be0
2 parents ba802cf + 6d133de
commit 3658be0
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 52 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -87,7 +87,7 @@ jobs:
       run: |
         sudo apt-get -y update
         sudo apt-get -y install exim4-daemon-light
-        sudo apt-get -y install `cut -d " " -f 1 config/packages.ubuntu-focal | egrep -v "(^#|wkhtml|bundler|^ruby|^rake)"`
+        sudo apt-get -y install `cut -d " " -f 1 config/packages | egrep -v "(^#|wkhtml|bundler|^ruby|^rake)"`
 
     - name: Install Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1

diff --git a/commonlib b/commonlib
diff --git a/config/packages.generic b/config/packages.generic
@@ -17,7 +17,7 @@ links
 lockfile-progs
 memcached
 mutt
-pdftk
+pdftk-java
 poppler-utils
 postgresql
 postgresql-client

diff --git a/config/packages.ubuntu-focal b/config/packages.ubuntu-focal
diff --git a/config/packages_development b/config/packages_development
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -2,6 +2,8 @@
 
 ## Highlighted Features
 
+* Add support for Debian 12 "Bookworm" (Graeme Porteous)
+* Add support for Ubuntu 22.04 LTS "Jammy Jellyfish" (Graeme Porteous)
 * Update alert daemon from init script to systemd (Sam Pearson)
 * Update incoming mail poller daemon from init script to systemd (Sam Pearson)
 * Update notification daemon from init script to systemd (Sam Pearson)

diff --git a/lib/tasks/submodules.rake b/lib/tasks/submodules.rake
@@ -2,6 +2,8 @@ namespace :submodules do
 
   desc "Check the status of the project's submodules"
   task check: :environment do
+    next unless Rails.env.production?
+
     commit_info = `git submodule status commonlib`
     case commit_info[0,1]
     when '+'

diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh
@@ -180,7 +180,13 @@ then
 EOF
 fi
 
-/etc/init.d/rsyslog restart
+if { [ "$DISTRIBUTION" = "ubuntu" ] && [ "$DISTVERSION" = "jammy" ]; } ||
+   { [ "$DISTRIBUTION" = "debian" ] && [ "$DISTVERSION" = "bookworm" ]; }
+then
+  systemctl restart rsyslog.service
+else
+  /etc/init.d/rsyslog restart
+fi
 
 newaliases
 postmap /etc/postfix/transports