Merge branch 'main' of github.com:binwiederhier/ntfy into main
This commit is contained in:
commit
014b561b29
4 changed files with 35 additions and 31 deletions
|
@ -6,33 +6,34 @@ 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
|
||||||
# Create ntfy user/group
|
if [ -d /run/systemd/system ]; then
|
||||||
id ntfy >/dev/null 2>&1 || useradd --system --no-create-home ntfy
|
# Create ntfy user/group
|
||||||
chown ntfy.ntfy /var/cache/ntfy
|
id ntfy >/dev/null 2>&1 || useradd --system --no-create-home ntfy
|
||||||
chmod 700 /var/cache/ntfy
|
chown ntfy.ntfy /var/cache/ntfy
|
||||||
|
chmod 700 /var/cache/ntfy
|
||||||
|
|
||||||
# Hack to change permissions on cache file
|
# Hack to change permissions on cache file
|
||||||
configfile="/etc/ntfy/server.yml"
|
configfile="/etc/ntfy/server.yml"
|
||||||
if [ -f "$configfile" ]; then
|
if [ -f "$configfile" ]; then
|
||||||
cachefile="$(cat "$configfile" | perl -n -e'/^\s*cache-file: ["'"'"']?([^"'"'"']+)["'"'"']?/ && print $1')" # Oh my, see #47
|
cachefile="$(cat "$configfile" | perl -n -e'/^\s*cache-file: ["'"'"']?([^"'"'"']+)["'"'"']?/ && print $1')" # Oh my, see #47
|
||||||
if [ -n "$cachefile" ]; then
|
if [ -n "$cachefile" ]; then
|
||||||
chown ntfy.ntfy "$cachefile" || true
|
chown ntfy.ntfy "$cachefile" || true
|
||||||
chmod 600 "$cachefile" || true
|
chmod 600 "$cachefile" || true
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
# Restart services
|
# Restart services
|
||||||
systemctl --system daemon-reload >/dev/null || true
|
systemctl --system daemon-reload >/dev/null || true
|
||||||
if systemctl is-active -q ntfy.service; then
|
if systemctl is-active -q ntfy.service; then
|
||||||
echo "Restarting ntfy.service ..."
|
echo "Restarting ntfy.service ..."
|
||||||
if [ -x /usr/bin/deb-systemd-invoke ]; then
|
if [ -x /usr/bin/deb-systemd-invoke ]; then
|
||||||
deb-systemd-invoke try-restart ntfy.service >/dev/null || true
|
deb-systemd-invoke try-restart ntfy.service >/dev/null || true
|
||||||
else
|
else
|
||||||
systemctl restart ntfy.service >/dev/null || true
|
systemctl restart ntfy.service >/dev/null || true
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
if systemctl is-active -q ntfy-client.service; then
|
||||||
if systemctl is-active -q ntfy-client.service; then
|
|
||||||
echo "Restarting ntfy-client.service ..."
|
echo "Restarting ntfy-client.service ..."
|
||||||
if [ -x /usr/bin/deb-systemd-invoke ]; then
|
if [ -x /usr/bin/deb-systemd-invoke ]; then
|
||||||
deb-systemd-invoke try-restart ntfy-client.service >/dev/null || true
|
deb-systemd-invoke try-restart ntfy-client.service >/dev/null || true
|
||||||
|
@ -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
|
||||||
echo "Stopping ntfy.service ..."
|
if [ "$1" = "remove" ] || [ "$1" = "0" ]; then
|
||||||
if [ -x /usr/bin/deb-systemd-invoke ]; then
|
echo "Stopping ntfy.service ..."
|
||||||
deb-systemd-invoke stop 'ntfy.service' >/dev/null || true
|
if [ -x /usr/bin/deb-systemd-invoke ]; then
|
||||||
else
|
deb-systemd-invoke stop 'ntfy.service' >/dev/null || true
|
||||||
systemctl stop ntfy >/dev/null 2>&1 || true
|
else
|
||||||
|
systemctl stop ntfy >/dev/null 2>&1 || true
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue