Merge pull request #86 from cmeis/rpm-rhel
Adjust RPM scriptlets to work on RHEL-flavour OSes, too.
This commit is contained in:
commit
5ea2751423
4 changed files with 35 additions and 31 deletions
|
@ -6,7 +6,8 @@ set -e
|
||||||
#
|
#
|
||||||
# TODO: This is only tested on Debian.
|
# TODO: This is only tested on Debian.
|
||||||
#
|
#
|
||||||
if [ "$1" = "configure" ] && [ -d /run/systemd/system ]; then
|
if [ "$1" = "configure" ] || [ "$1" -ge 1 ]; then
|
||||||
|
if [ -d /run/systemd/system ]; then
|
||||||
# Create ntfy user/group
|
# Create ntfy user/group
|
||||||
id ntfy >/dev/null 2>&1 || useradd --system --no-create-home ntfy
|
id ntfy >/dev/null 2>&1 || useradd --system --no-create-home ntfy
|
||||||
chown ntfy.ntfy /var/cache/ntfy
|
chown ntfy.ntfy /var/cache/ntfy
|
||||||
|
@ -40,4 +41,5 @@ if [ "$1" = "configure" ] && [ -d /run/systemd/system ]; then
|
||||||
systemctl restart ntfy-client.service >/dev/null || true
|
systemctl restart ntfy-client.service >/dev/null || true
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Delete the config if package is purged
|
# Delete the config if package is purged
|
||||||
if [ "$1" = "purge" ]; then
|
if [ "$1" = "purge" ] || [ "$1" = "0" ]; then
|
||||||
id ntfy >/dev/null 2>&1 && userdel ntfy
|
id ntfy >/dev/null 2>&1 && userdel ntfy
|
||||||
rm -f /etc/ntfy/server.yml /etc/ntfy/client.yml
|
rm -f /etc/ntfy/server.yml /etc/ntfy/client.yml
|
||||||
rmdir /etc/ntfy || true
|
rmdir /etc/ntfy || true
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
|
if [ "$1" = "install" ] || [ "$1" = "upgrade" ] || [ "$1" -ge 1 ]; then
|
||||||
# Migration of old to new config file name
|
# Migration of old to new config file name
|
||||||
oldconfigfile="/etc/ntfy/config.yml"
|
oldconfigfile="/etc/ntfy/config.yml"
|
||||||
configfile="/etc/ntfy/server.yml"
|
configfile="/etc/ntfy/server.yml"
|
||||||
|
|
|
@ -2,11 +2,13 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Stop systemd service
|
# Stop systemd service
|
||||||
if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
|
if [ -d /run/systemd/system ]; then
|
||||||
|
if [ "$1" = "remove" ] || [ "$1" = "0" ]; then
|
||||||
echo "Stopping ntfy.service ..."
|
echo "Stopping ntfy.service ..."
|
||||||
if [ -x /usr/bin/deb-systemd-invoke ]; then
|
if [ -x /usr/bin/deb-systemd-invoke ]; then
|
||||||
deb-systemd-invoke stop 'ntfy.service' >/dev/null || true
|
deb-systemd-invoke stop 'ntfy.service' >/dev/null || true
|
||||||
else
|
else
|
||||||
systemctl stop ntfy >/dev/null 2>&1 || true
|
systemctl stop ntfy >/dev/null 2>&1 || true
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue