From affa12712dc862c02e2f1e659231cf2e368f49f5 Mon Sep 17 00:00:00 2001 From: Sven Sager Date: Tue, 24 Jan 2023 13:00:08 +0100 Subject: [PATCH] Add default files for installation or packaging. --- data/etc/default/revpipyload | 4 ++++ data/etc/logrotate.d/revpipyload | 15 +++++++++++++++ data/lib/systemd/revpipyload.service | 13 +++++++++++++ data/revpipyload | 7 ------- data/revpipyload_secure_installation | 11 +++++------ data/revpipyloadd | 6 ++++++ src/revpipyload/helper.py | 2 +- 7 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 data/etc/default/revpipyload create mode 100644 data/etc/logrotate.d/revpipyload create mode 100644 data/lib/systemd/revpipyload.service delete mode 100755 data/revpipyload create mode 100755 data/revpipyloadd diff --git a/data/etc/default/revpipyload b/data/etc/default/revpipyload new file mode 100644 index 0000000..8998a52 --- /dev/null +++ b/data/etc/default/revpipyload @@ -0,0 +1,4 @@ +# Additional options that are passed to revpipyloadd. +# add -v or -vv for verbose logging + +DAEMON_OPTS="" diff --git a/data/etc/logrotate.d/revpipyload b/data/etc/logrotate.d/revpipyload new file mode 100644 index 0000000..252c34e --- /dev/null +++ b/data/etc/logrotate.d/revpipyload @@ -0,0 +1,15 @@ +/var/log/revpipyload +/var/log/revpipyloadapp +{ + rotate 6 + weekly + maxsize 1M + compress + delaycompress + missingok + notifempty + sharedscripts + postrotate + /bin/kill -s USR1 `cat /var/run/revpipyload.pid` > /dev/null 2>&1 || true + endscript +} diff --git a/data/lib/systemd/revpipyload.service b/data/lib/systemd/revpipyload.service new file mode 100644 index 0000000..1883512 --- /dev/null +++ b/data/lib/systemd/revpipyload.service @@ -0,0 +1,13 @@ +[Unit] +Description=Python PLC services for Revolution Pi +After=network.target + +[Service] +EnvironmentFile=-/etc/default/revpipyload +Type=forking +PIDFile=/var/run/revpipyload.pid +ExecStart=/usr/share/revpipyload/revpipyloadd -d $DAEMON_OPTS +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/data/revpipyload b/data/revpipyload deleted file mode 100755 index 3bf51f9..0000000 --- a/data/revpipyload +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -if [ -d /usr/local/share/revpipyload ] -then - exec "/usr/local/share/revpipyload/revpipyload.py" "$@" -else - exec "/usr/share/revpipyload/revpipyload.py" "$@" -fi diff --git a/data/revpipyload_secure_installation b/data/revpipyload_secure_installation index c339e8e..63c8b0a 100755 --- a/data/revpipyload_secure_installation +++ b/data/revpipyload_secure_installation @@ -1,7 +1,6 @@ #!/bin/sh -if [ -d /usr/local/share/revpipyload ] -then - exec "/usr/local/share/revpipyload/secure_installation.py" "$@" -else - exec "/usr/share/revpipyload/secure_installation.py" "$@" -fi +# This will call the entry point of the python package, if it is installed +# in /usr/share/revpipyload. Put this to your bin directory, which is in +# the PATH value + +exec "/usr/share/revpipyload/secure_installation" "$@" diff --git a/data/revpipyloadd b/data/revpipyloadd new file mode 100755 index 0000000..4c89853 --- /dev/null +++ b/data/revpipyloadd @@ -0,0 +1,6 @@ +#!/bin/sh +# This will call the entry point of the python package, if it is installed +# in /usr/share/revpipyload. Put this to your bin directory, which is in +# the PATH value + +exec "/usr/share/revpipyload/revpipyloadd" "$@" diff --git a/src/revpipyload/helper.py b/src/revpipyload/helper.py index 45d0b1a..99107d3 100644 --- a/src/revpipyload/helper.py +++ b/src/revpipyload/helper.py @@ -2,7 +2,7 @@ """Helperfunktionen fuer das gesamte RevPiPyLoad-System.""" __author__ = "Sven Sager" __copyright__ = "Copyright (C) 2023 Sven Sager" -__license__ = "GPLv3" +__license__ = "GPLv2" import os from fcntl import ioctl