From 8a7ee45802a3b409a76521f4d6a93c8b91d7d6ac Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 8 Jan 2026 20:53:01 +0100 Subject: [PATCH 1/6] Add centos10 --- IDMETA | 2 +- doc/common | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IDMETA b/IDMETA index 30b003ed..18729cc7 100644 --- a/IDMETA +++ b/IDMETA @@ -1,4 +1,4 @@ DEBIAN_DIST="bullseye bookworm trixie" UBUNTU_DIST="focal jammy noble" -CENTOS_DIST="centos7 centos8 centos9" +CENTOS_DIST="centos7 centos8 centos9 centos10" VERSION=1.14.1 diff --git a/doc/common b/doc/common index 9fb378eb..e128b864 160000 --- a/doc/common +++ b/doc/common @@ -1 +1 @@ -Subproject commit 9fb378eb77b7bb5004580afcb2830671d68dbf8a +Subproject commit e128b8645250a51beb78d25592db8b1f916d3c60 From 33b60fe002f83e2f74fb8bb7db5b9a1538f0a4ae Mon Sep 17 00:00:00 2001 From: John Malconian Date: Thu, 26 Oct 2023 19:01:54 +0000 Subject: [PATCH 2/6] Add rhel/centos 9/systemd support --- pazpar2.spec | 19 +++++----- rpm/pazpar2.init | 82 ------------------------------------------- rpm/pazpar2.logrotate | 2 +- rpm/pazpar2.service | 18 ++++++++++ rpm/pazpar2.sysconfig | 4 +++ 5 files changed, 34 insertions(+), 91 deletions(-) delete mode 100755 rpm/pazpar2.init create mode 100644 rpm/pazpar2.service create mode 100644 rpm/pazpar2.sysconfig diff --git a/pazpar2.spec b/pazpar2.spec index c4343445..a03d72ee 100644 --- a/pazpar2.spec +++ b/pazpar2.spec @@ -35,15 +35,15 @@ for f in /usr/share/pazpar2/xsl/*.xsl; do fi done if [ $1 = 1 ]; then - /sbin/chkconfig --add pazpar2 - /sbin/service pazpar2 start > /dev/null 2>&1 + /usr/bin/systemctl daemon-reload > /dev/null 2>&1 + /usr/bin/systemctl enable pazpar2 > /dev/null 2>&1 + /usr/bin/systemctl start pazpar2 > /dev/null 2>&1 else - /sbin/service pazpar2 restart > /dev/null 2>&1 + /usr/bin/systemctl restart pazpar2 > /dev/null 2>&1 fi %preun if [ $1 = 0 ]; then - /sbin/service pazpar2 stop > /dev/null 2>&1 - /sbin/chkconfig --del pazpar2 + /usr/bin/systemctl stop pazpar2 > /dev/null 2>&1 fi %description -n pazpar2-js @@ -104,8 +104,10 @@ cp etc/settings/*.xml ${RPM_BUILD_ROOT}/etc/pazpar2/settings/ cp -r etc/settings/mkc ${RPM_BUILD_ROOT}/etc/pazpar2/settings mkdir -p ${RPM_BUILD_ROOT}/usr/share/pazpar2/xsl cp etc/xsl/*.xsl ${RPM_BUILD_ROOT}/usr/share/pazpar2/xsl -mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d/init.d -install -m755 rpm/pazpar2.init ${RPM_BUILD_ROOT}/etc/rc.d/init.d/pazpar2 +mkdir -p ${RPM_BUILD_ROOT}/etc/systemd/system +install -m755 rpm/pazpar2.service ${RPM_BUILD_ROOT}/etc/systemd/system/pazpar2.service +mkdir -p ${RPM_BUILD_ROOT}/etc/sysconfig +install -m644 rpm/pazpar2.sysconfig ${RPM_BUILD_ROOT}/etc/sysconfig/pazpar2 echo "Alias /pazpar2 /usr/share/pazpar2" >${RPM_BUILD_ROOT}/etc/pazpar2/ap2pazpar2-js.cfg mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d install -m644 rpm/pazpar2.logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/pazpar2 @@ -127,7 +129,8 @@ rm -fr ${RPM_BUILD_ROOT} %config %{_sysconfdir}/pazpar2/settings/*.xml %config %{_sysconfdir}/pazpar2/settings/*/*.xml %config %{_sysconfdir}/pazpar2/services-available/*.xml -%config %{_sysconfdir}/rc.d/init.d/pazpar2 +%config %{_sysconfdir}/sysconfig/pazpar2 +%config %{_sysconfdir}/systemd/system/pazpar2.service %config(noreplace) /etc/logrotate.d/pazpar2 %{_mandir}/man1/pazpar2* %{_mandir}/man5/pazpar2* diff --git a/rpm/pazpar2.init b/rpm/pazpar2.init deleted file mode 100755 index a77b7d11..00000000 --- a/rpm/pazpar2.init +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -# -# pazpar2 Startup script for Pazpar2 -# -# chkconfig: 2345 85 15 -# description: Pazpar2 Metasearcher -# processname: pazpar2 -# config: /etc/pazpar2/server.xml -# config: /etc/sysconfig/pazpar2 -# pidfile: /var/run/pazpar2.pid - -# Source function library. -OPTIONS="-u nobody -l /var/log/pazpar2.log -f /etc/pazpar2/server.xml" -. /etc/rc.d/init.d/functions - -if [ -f /etc/sysconfig/pazpar2 ]; then - . /etc/sysconfig/pazpar2 -fi - -# Path to the apachectl script, server binary, and short-form for messages. -DAEMON=${DAEMON-/usr/sbin/pazpar2} -prog=pazpar2 -pidfile=${PIDFILE-/var/run/pazpar2.pid} -lockfile=${LOCKFILE-/var/lock/subsys/pazpar2} -RETVAL=0 - -start() { - echo -n $"Starting $prog: " - daemon --pidfile=${pidfile} $DAEMON $OPTIONS -D -p ${pidfile} - RETVAL=$? - echo - [ $RETVAL = 0 ] && touch ${lockfile} - return $RETVAL -} - -stop() { - echo -n $"Stopping $prog: " - killproc -p ${pidfile} -d 10 $DAEMON - RETVAL=$? - echo - [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} -} -reload() { - stop - start -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p ${pidfile} $DAEMON - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f ${pidfile} ] ; then - stop - start - fi - ;; - reload) - reload - ;; - configtest) - $DAEMON $OPTIONS -t - RETVAL=$? - ;; - *) - echo $"Usage: $prog {start|stop|restart|help|configtest}" - exit 1 -esac - -exit $RETVAL diff --git a/rpm/pazpar2.logrotate b/rpm/pazpar2.logrotate index b2bd6fba..93fd2b83 100644 --- a/rpm/pazpar2.logrotate +++ b/rpm/pazpar2.logrotate @@ -7,7 +7,7 @@ notifempty postrotate if [ -f /var/run/pazpar2.pid ]; then - /sbin/service pazpar2 restart > /dev/null + /user/bin/systemctl restart pazpar2 > /dev/null fi endscript } diff --git a/rpm/pazpar2.service b/rpm/pazpar2.service new file mode 100644 index 00000000..660ca60e --- /dev/null +++ b/rpm/pazpar2.service @@ -0,0 +1,18 @@ +# Pazpar2 systemd-style configuration + +[Unit] +Description=Pazpar2 Metasearcher +Documentation=man:pazpar2(8) +After=network.target + +[Service] +Type=simple +EnvironmentFile=/etc/sysconfig/pazpar2 +Restart=on-abort +KillMode=process +PIDFile=${PP2_PID_FILE} +ExecStart=/bin/bash -ce "exec /usr/sbin/pazpar2 ${PP2_OPTIONS}" + +[Install] +WantedBy=multi-user.target + diff --git a/rpm/pazpar2.sysconfig b/rpm/pazpar2.sysconfig new file mode 100644 index 00000000..ae3f60dd --- /dev/null +++ b/rpm/pazpar2.sysconfig @@ -0,0 +1,4 @@ +PP2_USER=nobody +PP2_LOG=/var/log/pazpar2 +PP2_PID_FILE=/var/run/pazpar2.pid +PP2_OPTIONS="-u ${PP2_USER} -l ${PP2_LOG} -f /etc/pazpar2/server.xml -p $PP2_PID_FILE" From 278d5d4325ecf3cbee1bb34eef515aa230d4c072 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 8 Jan 2026 21:09:37 +0100 Subject: [PATCH 3/6] tabs --- pazpar2.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pazpar2.spec b/pazpar2.spec index a03d72ee..eca35d15 100644 --- a/pazpar2.spec +++ b/pazpar2.spec @@ -35,15 +35,15 @@ for f in /usr/share/pazpar2/xsl/*.xsl; do fi done if [ $1 = 1 ]; then - /usr/bin/systemctl daemon-reload > /dev/null 2>&1 - /usr/bin/systemctl enable pazpar2 > /dev/null 2>&1 - /usr/bin/systemctl start pazpar2 > /dev/null 2>&1 + /usr/bin/systemctl daemon-reload > /dev/null 2>&1 + /usr/bin/systemctl enable pazpar2 > /dev/null 2>&1 + /usr/bin/systemctl start pazpar2 > /dev/null 2>&1 else - /usr/bin/systemctl restart pazpar2 > /dev/null 2>&1 + /usr/bin/systemctl restart pazpar2 > /dev/null 2>&1 fi %preun if [ $1 = 0 ]; then - /usr/bin/systemctl stop pazpar2 > /dev/null 2>&1 + /usr/bin/systemctl stop pazpar2 > /dev/null 2>&1 fi %description -n pazpar2-js From 95817645d324e971761d57654de379d5f6bfe3aa Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 8 Jan 2026 21:10:07 +0100 Subject: [PATCH 4/6] fix call to systemctl --- rpm/pazpar2.logrotate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/pazpar2.logrotate b/rpm/pazpar2.logrotate index 93fd2b83..6893f89f 100644 --- a/rpm/pazpar2.logrotate +++ b/rpm/pazpar2.logrotate @@ -7,7 +7,7 @@ notifempty postrotate if [ -f /var/run/pazpar2.pid ]; then - /user/bin/systemctl restart pazpar2 > /dev/null + /usr/bin/systemctl restart pazpar2 > /dev/null fi endscript } From e3826603d779e3f688a082f4ec36e9fe86f1700d Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 8 Jan 2026 21:11:09 +0100 Subject: [PATCH 5/6] systemctl, so no centos7, 8 --- IDMETA | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IDMETA b/IDMETA index 18729cc7..61beee0e 100644 --- a/IDMETA +++ b/IDMETA @@ -1,4 +1,4 @@ DEBIAN_DIST="bullseye bookworm trixie" UBUNTU_DIST="focal jammy noble" -CENTOS_DIST="centos7 centos8 centos9 centos10" +CENTOS_DIST="centos9 centos10" VERSION=1.14.1 From a31973e89fd75f5d94ace12d17ef3aa26a1bdf63 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 8 Jan 2026 21:21:47 +0100 Subject: [PATCH 6/6] doc/common as in master --- doc/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/common b/doc/common index e128b864..9fb378eb 160000 --- a/doc/common +++ b/doc/common @@ -1 +1 @@ -Subproject commit e128b8645250a51beb78d25592db8b1f916d3c60 +Subproject commit 9fb378eb77b7bb5004580afcb2830671d68dbf8a