Merge 977dca8 into e398f6d

debian/changelog

@@ -1,3 +1,15 @@
+ola (0.11.0-1) UNRELEASED; urgency=medium
+  * debian/ola.postinst: add --home parameter to adduser invocation
+  * This change pulled from Debian by Perry Naseck <git@perrynaseck.com>
+    https://salsa.debian.org/wouter/ola/-/commit/b9a0e2ab290d64f215891e1d543079dd78e7125e
+   * Remove debconf usage
+   * This change pulled from Debian by Perry Naseck <git@perrynaseck.com>
+    https://salsa.debian.org/wouter/ola/-/commit/6d27c071547426536b6f8f0db193dcfd7a4e5991
+   * This change pulled from Debian by Perry Naseck <git@perrynaseck.com>
+    191514d233d2300674df7e9c3febb35c2890c50c
+
+ -- Perry Naseck <git@perrynaseck.com>  Thu, 20 Apr 2023 18:47:03 -0400
+
 ola (0.10.9-2) UNRELEASED; urgency=medium
 
   * Fix ola-rdm-tests Debian package by patching python shebangs to python3

debian/control

@@ -2,7 +2,7 @@ Source: ola
 Priority: optional
 Maintainer: Wouter Verhelst <wouter@debian.org>
 Uploaders: RenZO <renzo@imaginux.com>
-Build-Depends: debhelper (>= 13), autotools-dev, dh-autoreconf, dh-python, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python3, python3-protobuf, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi1-dev, liblo-dev, libmicrohttpd-dev, libncurses5-dev, libavahi-client-dev, python3-numpy
+Build-Depends: debhelper-compat (= 12), autotools-dev, dh-autoreconf, dh-python, bash-completion, libcppunit-dev, bison, flex, pkg-config, uuid-dev, python3, python3-protobuf, libprotobuf-dev, protobuf-compiler, libprotoc-dev, libusb-1.0-0-dev, libftdi1-dev, liblo-dev, libmicrohttpd-dev, libncurses5-dev, libavahi-client-dev, python3-numpy
 Standards-Version: 3.9.8
 Section: libs
 Vcs-Git: https://github.com/OpenLightingProject/ola.git

debian/ola-rdm-tests.dirs

@@ -1,3 +1,4 @@
+etc/ola
 usr/bin
 usr/lib
 usr/share

debian/ola-rdm-tests.rdm_test_server.init

@@ -17,16 +17,11 @@ DAEMON=/usr/bin/$NAME
 PIDFILE=/var/run/$CMD.pid
 DESC="OLA RDM Test Server"
 USER=olad
+DAEMON_ARGS="--world-writable"
 
 # Reads config file (will override defaults above)
 [ -r /etc/default/ola-rdm-tests ] && . /etc/default/ola-rdm-tests
 
-if [ "$RUN_DAEMON" = "true" ] || [ "$RUN_DAEMON" = "yes" ] ; then
-  DAEMON_ARGS="--world-writeable"
-elif [ "$1" = "start" ] || [ "$1" = "stop" ] ; then
-  echo "The init script is currently inactive;\nuse \"dpkg-reconfigure ola-rdm-tests\" to change this." >&2
-fi
-
 [ -x "$DAEMON" ] || exit 0
 
 . /lib/lsb/init-functions

debian/ola-rdm-tests.rdm_test_server.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Open Lighting Architecture RDM Test Server
+Documentation=man:olad(1)
+After=network.target remote-fs.target olad.service
+Wants=olad.service
+
+[Service]
+User=olad
+Environment=RDM_TEST_SERVER_OPTS="--world-writable"
+ExecStart=/usr/bin/rdm_test_server.py $RDM_TEST_SERVER_OPTS
+
+[Install]
+WantedBy=multi-user.target

debian/ola.dirs

@@ -1,3 +1,4 @@
+etc/ola
 usr/bin
 usr/lib
 usr/share/olad/www

debian/ola.olad.init

@@ -17,16 +17,13 @@ PIDFILE=/var/run/$NAME.pid
 DESC="OLA daemon"
 USER=olad
 LOG_LEVEL=3
-CONFIG_DIR="/var/lib/ola/conf"
+CONFIG_DIR="/etc/ola"
+OLAD_OPTS=""
 
 # Reads config file (will override defaults above)
 [ -r /etc/default/ola ] && . /etc/default/ola
 
-if [ "$RUN_DAEMON" = "true" ] || [ "$RUN_DAEMON" = "yes" ] ; then
-  DAEMON_ARGS="--syslog --log-level $LOG_LEVEL --config-dir $CONFIG_DIR"
-elif [ "$1" = "start" ] || [ "$1" = "stop" ] ; then
-  echo "The init script is currently inactive;\nuse \"dpkg-reconfigure ola\" to change this." >&2
-fi
+DAEMON_ARGS="--syslog --log-level $LOG_LEVEL --config-dir $CONFIG_DIR $OLAD_OPTS"
 
 [ -x "$DAEMON" ] || exit 0
 
@@ -43,12 +40,10 @@ case "$1" in
     ;;
   stop)
     # master switch
-    if [ "$RUN_DAEMON" = "true" ] || [ "$RUN_DAEMON" = "yes" ] ; then
-      log_daemon_msg "Stopping $DESC" "$NAME"
-      /sbin/start-stop-daemon --stop --pidfile $PIDFILE --chuid $USER --exec $DAEMON --retry 10
-      /bin/rm -f $PIDFILE
-      log_end_msg $?
-    fi
+    log_daemon_msg "Stopping $DESC" "$NAME"
+    /sbin/start-stop-daemon --stop --pidfile $PIDFILE --chuid $USER --exec $DAEMON --retry 10
+    /bin/rm -f $PIDFILE
+    log_end_msg $?
     ;;
   reload|force-reload|restart)
     $0 stop && $0 start

debian/ola.olad.service

@@ -0,0 +1,16 @@
+[Unit]
+Description=Open Lighting Architecture daemon
+Documentation=man:olad(1)
+After=network.target remote-fs.target network-online.target
+Wants=network-online.target
+
+[Service]
+User=olad
+Environment=LOG_LEVEL=3
+Environment=CONFIG_DIR=/etc/ola
+Environment=OLAD_OPTS=
+ExecStart=/usr/bin/olad --log-level $LOG_LEVEL --config-dir $CONFIG_DIR $OLAD_OPTS
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target

debian/ola.postinst

@@ -1,74 +1,15 @@
 #!/bin/sh -e
 # postinst script for ola
 
-conffile="/etc/default/ola"
-
-update_config_file() {
-  db_field=$1
-  config_field=$2
-
-  RET=false
-  db_get $db_field
-  if [ -n "$RET" ] ; then
-    if grep -q "^$config_field" $conffile ; then
-      # keep any admin changes, while replacing the variable content
-      sed "s/^[ ]*$config_field=\".*\"/$config_field=\"$RET\"/" < $conffile > $conffile.new && 
-      mv $conffile.new $conffile
-    else
-      echo "$config_field=\"$RET\"" >> $conffile
-    fi
-  fi
-}
-
-# Source debconf library -- we have a Depends line
-# to make sure it is there...
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-case "$1" in
-  configure)
-  if [ -f $conffile ] ; then
-    sed -i -e 's/^[ ]*DAEMON/RUN_DAEMON/g' $conffile
-  else
-    cat << EOF > $conffile
-# Defaults for ola initscript (/etc/init.d/ola)
-# This is a POSIX shell fragment
-
-# [automatically edited by postinst, do not change line format ]
-
-# ola daemon switch. If set to true, olad will run.
-RUN_DAEMON="true"
-EOF
-  fi
-
-  update_config_file ola/daemon RUN_DAEMON
-
-  db_stop
-  ;;
-
-  abort-upgrade|abort-remove|abort-deconfigure)
-  ;;
-
-  *)
-    echo "postinst called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-esac
-
 #create the olad user, add it to groups
-getent passwd olad > /dev/null || adduser --system --no-create-home olad
+getent passwd olad > /dev/null || adduser --system --home /usr/lib/olad --no-create-home olad
 getent group olad > /dev/null || addgroup --system olad
 groups olad | grep dialout > /dev/null || adduser olad dialout
 groups olad | grep plugdev > /dev/null || adduser olad plugdev
 
 # setup the config dir
-CONF_DIR=/var/lib/ola
-if [ ! -d ${CONF_DIR} ]; then
-  mkdir -p ${CONF_DIR};
-  chown -R olad:olad ${CONF_DIR};
-  chmod g+s ${CONF_DIR};
-fi;
-
+chown -R olad:olad /etc/ola
+chmod g+s /etc/ola
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.

debian/rules

@@ -11,7 +11,7 @@
 export VERBOSE=1
 
 %:
-	dh $@ --parallel --with autotools_dev,autoreconf,bash_completion,python3
+	dh $@ --parallel --with bash_completion,python3
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-python-libs --enable-rdm-tests CXXFLAGS='-Wno-error=deprecated-declarations -Wno-error=unused-parameter' pythondir='/usr/lib/python3/dist-packages'
@@ -20,6 +20,10 @@ override_dh_installinit:
 	dh_installinit -p ola --name=olad
 	dh_installinit -p ola-rdm-tests --name=rdm_test_server
 
+override_dh_installsystemd:
+	dh_installsystemd -p ola --name=olad
+	dh_installsystemd -p ola-rdm-tests --name=rdm_test_server
+
 override_dh_makeshlibs:
 	dh_makeshlibs -V