From 802743bb7852c934b6d47b1fdc7c30b62fdbc241 Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Tue, 5 Dec 2023 08:26:55 +0000 Subject: [PATCH 1/6] Update packages list The latest PDFtk can be install on both Debian and Ubuntu with the `pdftk-java` package. No need to have a distribution specific packages file anymore. --- .github/workflows/ci.yml | 2 +- config/packages.generic | 2 +- config/packages.ubuntu-focal | 37 ------------------------------------ 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 config/packages.ubuntu-focal diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 846586100a..5817f9444a 100644 --- 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/config/packages.generic b/config/packages.generic index afacbe1236..fc9b482da4 100644 --- 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 deleted file mode 100644 index fc9b482da4..0000000000 --- a/config/packages.ubuntu-focal +++ /dev/null @@ -1,37 +0,0 @@ -build-essential -bundler -catdoc -elinks -gettext -ghostscript -gnuplot-nox -imagemagick -libicu-dev -libmagic-dev -libmagickwand-dev -libpq-dev -libsqlite3-dev -libxml2-dev -libxslt-dev -links -lockfile-progs -memcached -mutt -pdftk-java -poppler-utils -postgresql -postgresql-client -rake -redis -rsyslog -ruby -ruby-dev -sqlite3 -tnef -ttf-bitstream-vera -unrtf -unzip -uuid-dev -wkhtmltox -wv -xapian-tools From ebb2d85c1bf0a2eddc1e5af338c795f67b90a736 Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Tue, 5 Dec 2023 08:28:35 +0000 Subject: [PATCH 2/6] Remove unused development package file --- config/packages_development | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 config/packages_development diff --git a/config/packages_development b/config/packages_development deleted file mode 100644 index 7ac143bc2f..0000000000 --- a/config/packages_development +++ /dev/null @@ -1,11 +0,0 @@ -# This is a list of packages needed on a fresh Ubuntu installation for -# development. -# -# It assumes you're using RVM or a similar Ruby manager and have already -# run `bundle install`. -# -# To install, paste this list after `sudo apt-get install` and run. -elinks -pdftk -postgresql -tnef From 93594ee22b5f30033c8df7ad8e7974ff73e2cc08 Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Tue, 5 Dec 2023 08:29:03 +0000 Subject: [PATCH 3/6] Update submodule check rake task Allow submodules not to up-to-date in test/development environments allowing us to test changes to commonlib when running install scripts. --- lib/tasks/submodules.rake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/tasks/submodules.rake b/lib/tasks/submodules.rake index 94e4034d98..d2d4aaf82a 100644 --- 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 '+' From 582fb65650377e09eaf24791c2fc7e51ddf08c6b Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Tue, 5 Dec 2023 08:31:49 +0000 Subject: [PATCH 4/6] Update rsyslog restart commands Both Bookworm and Jammy are using systemd rather than init.d scripts. --- script/site-specific-install.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh index b6ca3f1bd2..659d49031a 100755 --- 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 From 8ad3bd8d59594ca62c2c71a3a1f9acc98855ba14 Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Thu, 7 Dec 2023 13:20:13 +0000 Subject: [PATCH 5/6] Update commonlib --- commonlib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commonlib b/commonlib index 6149757c74..caadeeb06b 160000 --- a/commonlib +++ b/commonlib @@ -1 +1 @@ -Subproject commit 6149757c743b7e746aceb650e78a497a46bcc64f +Subproject commit caadeeb06b5588786efc3370b7c36b81aa56c222 From 6d133defc1c11f60f2dda57c8f9f03a502a3970e Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Thu, 7 Dec 2023 13:21:51 +0000 Subject: [PATCH 6/6] Update changelog --- doc/CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 94ca22e1f9..bd61337a5d 100644 --- 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) * Allow `InfoRequest` to be categorised (Graeme Porteous) * Replace public body categories with generalised categories (Graeme Porteous) * Add admin links to and from batch request show action (Graeme Porteous)