diff --git a/README.md b/README.md index 9872759..f0a505f 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Falls `/etc/foodoord.conf` nicht vorhanden ist: * `mv /etc/foodoord.conf_example /etc/foodoord.conf` 1. Trage dort die API-Config für den Türstatus ein. -2. Sind wir oben oder unten? Diese Information in `where` eintragen. Also bspw. `where = oben`. +2. Falls nicht schon beim Paketinstall geschehen, mit `systemctl enable --now foodoord@oben` oder `systemctl enable --now foodoord@unten` enablen und starten. @@ -23,8 +23,8 @@ Der Deamon besteht aus folgenden Dateien. * foodoor * foodoord * foodoord.conf -* foodoord_initd * foodoor-update-keydb +* foodoord@.service Zusätzlich sollte für das git-repo eine Config angelegt werden: diff --git a/build-package b/build-package index 0e05041..ad26c6d 100755 --- a/build-package +++ b/build-package @@ -1,3 +1,3 @@ #!/bin/bash -VERSION=3.0.3 +VERSION=3.0.4 dpkg-deb --root-owner-group -b debian foodoord_${VERSION}_all.deb diff --git a/debian/DEBIAN/control b/debian/DEBIAN/control old mode 100644 new mode 100755 index 15ad2f6..64f9fbc --- a/debian/DEBIAN/control +++ b/debian/DEBIAN/control @@ -1,6 +1,6 @@ Package: foodoord -Version: 3.0.3 +Version: 3.0.4 Maintainer: Bandie Architecture: all Description: Control the doors of the club, ja! -Depends: dash, git, python3 +Depends: dash, git, python3, pip, tmux diff --git a/debian/DEBIAN/postinst b/debian/DEBIAN/postinst index 5676e66..f3f7675 100755 --- a/debian/DEBIAN/postinst +++ b/debian/DEBIAN/postinst @@ -1,5 +1,4 @@ #!/bin/bash -set -x echo "Creating group and users.." groupadd foodoor useradd -M -d /var/lib/foodoor/close -G foodoor -s /bin/sh close @@ -12,11 +11,25 @@ for u in close open door; do chown ${u}:${u} /var/lib/foodoor/${u} done +echo "Chmod foodoor" +chmod 755 /var/lib/foodoor + echo "Create /state" touch /state chown root:foodoor /state chmod 664 /state +echo "##################" +while [ "$prompt" != "oben" -a "$prompt" != "unten" ]; do + read -p "Sind wir oben oder unten? (oben, unten): " prompt +done +echo "##################" + +echo "Installing dependencies via pip: pifacecommon pifacedigitalio" +pip install pifacecommon pifacedigitalio + +echo "Enabling and starting systemd-Services" systemctl daemon-reload -systemctl enable foodoord -systemctl restart foodoord +systemctl enable foodoord@$prompt +systemctl restart foodoord@$prompt +systemctl status foodoord@$prompt diff --git a/debian/etc/cron.d/foodoord b/debian/etc/cron.d/foodoord old mode 100644 new mode 100755 diff --git a/debian/etc/foodoord.conf_example b/debian/etc/foodoord.conf_example old mode 100644 new mode 100755 index a6b1b59..2228d89 --- a/debian/etc/foodoord.conf_example +++ b/debian/etc/foodoord.conf_example @@ -2,7 +2,3 @@ status_url = key = secret = - -[foodoord] -# oben or unten -where= diff --git a/debian/etc/init.d/foodoord b/debian/etc/init.d/foodoord deleted file mode 100755 index dff0905..0000000 --- a/debian/etc/init.d/foodoord +++ /dev/null @@ -1,156 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: foodoor -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: foodoor initscript -# Description: Daemon to lock and unlock the foodoor -### END INIT INFO - -# Author: gammlaa - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="foodoor daemon" -WHERE=$(cat /etc/foodoord.conf | grep 'where' | awk -F '=' '{ print $2 }' | tr -d ' ') -NAME=foodoord_${WHERE} -DAEMON=/usr/sbin/$NAME -#DAEMON_ARGS="--options args" -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --background --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name python2 - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --pidfile $PIDFILE --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/debian/etc/systemd/system/foodoord@.service b/debian/etc/systemd/system/foodoord@.service new file mode 100755 index 0000000..cf1ba2d --- /dev/null +++ b/debian/etc/systemd/system/foodoord@.service @@ -0,0 +1,15 @@ +[Unit] +Description=foodoord %i +After=network-online.target +Wants=network-online.target systemd-networkd-wait-online.service + +[Service] +Type=simple +ExecStart=/usr/sbin/foodoord_%i +Restart=on-failure +RestartSec=5s + + +[Install] +WantedBy=multi-user.target +