diff --git a/debian/koha-sysv.install b/debian/koha-sysv.install index 3298ad35aa..c2dca6c03c 100644 --- a/debian/koha-sysv.install +++ b/debian/koha-sysv.install @@ -1,2 +1 @@ debian/koha-sysv.init etc/init.d/koha-common -debian/koha-sysv.service lib/systemd/system/ diff --git a/debian/koha-sysv.postinst b/debian/koha-sysv.postinst index d9be8f79fe..ec8edf56f9 100755 --- a/debian/koha-sysv.postinst +++ b/debian/koha-sysv.postinst @@ -6,8 +6,9 @@ case "$1" in configure) # Bug 18250: Correct startup order of koha-common and memcached. # On non-systemd systems only: force the rc.d ordering. - # On systemd, dh_installsystemd (via #DEBHELPER# below) enables and - # starts koha-sysv.service automatically; no manual enable needed. + # On systemd hosts, systemd-sysv-generator wraps /etc/init.d/koha-common + # as koha-common.service and honors the rc.d symlinks; no manual + # enable needed. if [ ! -d /run/systemd/system ]; then update-rc.d koha-common disable update-rc.d koha-common enable diff --git a/debian/koha-sysv.service b/debian/koha-sysv.service deleted file mode 100644 index 029890b3c6..0000000000 --- a/debian/koha-sysv.service +++ /dev/null @@ -1,25 +0,0 @@ -# koha-common.service -# /etc/systemd/system/koha-common.service - -[Unit] -Description=Start required services for each Koha instance -SourcePath=/etc/init.d/koha-common -Before=multi-user.target -Before=graphical.target -After=remote-fs.target -After=memcached.service - -[Service] -Type=forking -Restart=no -TimeoutSec=5min -IgnoreSIGPIPE=no -KillMode=process -GuessMainPID=no -RemainAfterExit=yes -SuccessExitStatus=5 6 -ExecStart=/etc/init.d/koha-common start -ExecStop=/etc/init.d/koha-common stop - -[Install] -WantedBy=multi-user.target diff --git a/debian/templates/koha-worker@.service b/debian/templates/koha-worker@.service deleted file mode 100644 index 1450a627e1..0000000000 --- a/debian/templates/koha-worker@.service +++ /dev/null @@ -1,19 +0,0 @@ -# koha-worker@.service -# /etc/systemd/system/koha-worker@.service -[Unit] -Description=Koha Task Queue Worker -After=syslog.target network.target - -[Service] -User=%i-koha -Environment=PERL5LIB=/usr/share/koha/lib -Environment=KOHA_CONF=/etc/koha/sites/%i/koha-conf.xml -ExecStart=/usr/share/koha/bin/workers/background_jobs_worker.pl -Restart=on-failure -RestartSec=5s -StartLimitBurst=3 -StartLimitInterval=60 -SyslogIdentifier=%i-koha-worker - -[Install] -WantedBy=multi-user.target