diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fa658f..3ab3637 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) but do not follows semantic versioning as it is useless in this type of project. +## [2.7.4-6] - 2026-08-09 + +### Added + +* gpg configuration to skip keyboxd, so importing nocem gpg keys will work. + +### Changed + +* nocem keyring will be removed and re-imported every container launch. + ## [2.7.4-5] - 2026-08-02 ### Added @@ -54,6 +64,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) Initial container release with inn 2.7.4 built with perl/python/sqlite support. +[2.7.4-6]: https://code.pztrn.name/containers/inn2/compare/2.7.4-5...2.7.4-6 [2.7.4-5]: https://code.pztrn.name/containers/inn2/compare/2.7.4-4...2.7.4-5 [2.7.4-4]: https://code.pztrn.name/containers/inn2/compare/2.7.4-3...2.7.4-4 [2.7.4-3]: https://code.pztrn.name/containers/inn2/compare/2.7.4-2...2.7.4-3 diff --git a/etc/cont-init.d/15-gpg.sh b/etc/cont-init.d/15-gpg.sh new file mode 100755 index 0000000..1377fb8 --- /dev/null +++ b/etc/cont-init.d/15-gpg.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +if [ -f "/etc/gpg/gpg.conf" ]; then + exit 0 +fi + +rm -rf /etc/gpg || exit 0 +mkdir -p /etc/gpg +echo "use-keyboxd 0" > /etc/gpg/gpg.conf diff --git a/etc/cont-init.d/30-nocem-keyring.sh b/etc/cont-init.d/30-nocem-keyring.sh index 61f219a..940a6bb 100755 --- a/etc/cont-init.d/30-nocem-keyring.sh +++ b/etc/cont-init.d/30-nocem-keyring.sh @@ -1,16 +1,14 @@ #!/bin/sh -if [ -f "/inn2/etc/pgp/ncmring.gpg" ]; then - exit 0 -fi - if [ ! -d "/inn2/etc/pgp" ]; then mkdir -p "/inn2/etc/pgp" fi echo "* Downloading NoCeM gpg keys and ctl file..." -curl -o /inn2/etc/pgp/ncmring.gpg https://rosalind.home.xs4all.nl/nocemreg/ncmring.asc +rm /inn2/etc/pgp/ncmring.gpg +curl -o /inn2/etc/pgp/ncmring.gpg.source https://rosalind.home.xs4all.nl/nocemreg/ncmring.asc +gpg --no-default-keyring --keyring /inn2/etc/pgp/ncmring.gpg --import /inn2/etc/pgp/ncmring.gpg.source chown -R news:news /inn2/etc/nocem.ctl /inn2/etc/pgp echo "* Enabling NoCeM processing..."