Maintenance: Make service naming consistent in package and source ins…

…tallations.

Procfile

@@ -1,3 +1,3 @@
 web: bundle exec script/rails server -b ${ZAMMAD_BIND_IP:=127.0.0.1} -p ${ZAMMAD_RAILS_PORT:=3000}
 websocket: bundle exec script/websocket-server.rb -b ${ZAMMAD_BIND_IP:=127.0.0.1} -p ${ZAMMAD_WEBSOCKET_PORT:=6042} start
-worker: bundle exec script/background-services.rb start
+background-worker: bundle exec script/background-worker.rb start

Procfile.dev

@@ -1,4 +1,4 @@
 vite: bin/vite dev
 web: bundle exec script/rails server -b ${ZAMMAD_BIND_IP:=127.0.0.1} -p ${ZAMMAD_RAILS_PORT:=3000}
 websocket: bundle exec script/websocket-server.rb -b ${ZAMMAD_BIND_IP:=127.0.0.1} -p ${ZAMMAD_WEBSOCKET_PORT:=6042} start
-worker: bundle exec script/background-services.rb start
+background-worker: bundle exec script/background-worker.rb start

contrib/packager.io/functions

@@ -108,7 +108,7 @@ function detect_webserver () {
 
 function create_initscripts () {
   echo "# (Re)creating init scripts"
-  zammad scale web=${ZAMMAD_WEBS} websocket=${ZAMMAD_WEBSOCKETS} worker=${ZAMMAD_WORKERS}
+  zammad scale web="${ZAMMAD_WEBS}" websocket="${ZAMMAD_WEBSOCKETS}" background-worker="${ZAMMAD_WORKERS}"
 
   echo "# Enabling Zammad on boot"
   ${INIT_CMD} enable zammad

script/scheduler.rb

@@ -13,7 +13,7 @@
 require 'bundler'
 require 'daemons'
 
-DEPRECATION_WARNING = "'script/scheduler.rb' is deprecated and will be removed with Zammad 6. Please use 'script/background-services.rb' instead - note that this will not daemonize but always stay in the foreground.".freeze
+DEPRECATION_WARNING = "'script/scheduler.rb' is deprecated and will be removed with Zammad 6. Please use 'script/background-worker.rb' instead - note that this will not daemonize but always stay in the foreground.".freeze
 warn "DEPRECATION WARNING: #{DEPRECATION_WARNING}"
 
 def before_fork

script/systemd/install-zammad-systemd-services.sh

@@ -17,7 +17,11 @@ test -d ${SYSTEMD_SERVICE_DIR} || mkdir -p ${SYSTEMD_SERVICE_DIR}
 
 cp zammad.env ${ZAMMAD_ENV_DIR}
 
-cp zammad.service zammad-rails.service zammad-scheduler.service zammad-websocket.service ${SYSTEMD_SERVICE_DIR}
+cp zammad.service zammad-web.service zammad-background-worker.service zammad-websocket.service ${SYSTEMD_SERVICE_DIR}
+
+# Remove renamed services if they exist.
+rm -f "${SYSTEMD_SERVICE_DIR}/zammad-scheduler.service"
+rm -f "${SYSTEMD_SERVICE_DIR}/zammad-rails.service"
 
 systemctl daemon-reload
 

script/systemd/zammad-scheduler.service → script/systemd/zammad-background-worker.service

@@ -1,20 +1,19 @@
 [Unit]
-Description=Zammad scheduler
+Description=Zammad Background Worker
 After=syslog.target
 After=network.target
 After=zammad.service
 Requires=zammad.service
 
 [Service]
-Type=forking
 EnvironmentFile=/etc/zammad/zammad.env
 User=zammad
 Group=zammad
 Restart=always
 
 WorkingDirectory=/opt/zammad
 
-ExecStart=/bin/bash -l -c "${BUNDLE_BINARY} exec script/scheduler.rb start"
+ExecStart=/bin/bash -l -c "${BUNDLE_BINARY} exec script/background-worker.rb start"
 
 [Install]
 WantedBy=zammad.service

script/systemd/zammad-rails.service → script/systemd/zammad-web.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Zammad rails server
+Description=Zammad Web Server
 After=syslog.target
 After=network.target
 After=zammad.service

script/systemd/zammad-websocket.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Zammad websocket
+Description=Zammad Websocket Server
 After=syslog.target
 After=network.target
 After=zammad.service

script/systemd/zammad.service

@@ -3,8 +3,8 @@ Description=Zammad
 After=syslog.target
 After=network.target
 StopWhenUnneeded=true
-Wants=zammad-rails.service
-Wants=zammad-scheduler.service
+Wants=zammad-web.service
+Wants=zammad-background-worker.service
 Wants=zammad-websocket.service
 
 [Service]

spec/lib/background_services/cli_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe BackgroundServices::Cli, ensure_threads_exited: true do
-  context 'when invoking scripts/background-services.rb via CLI' do
+  context 'when invoking scripts/background-worker.rb via CLI' do
 
     context 'without arguments' do
       it 'shows a help screen' do