diff --git a/helpers/install.sh b/helpers/install.sh index 537006a..1ef37d4 100755 --- a/helpers/install.sh +++ b/helpers/install.sh @@ -891,7 +891,7 @@ if [ "$OS" = "alpine" ] ; then CRON_PATH="/etc/crontabs/nginx" else CRON_SRC="/tmp/bunkerized-nginx/misc/cron-linux" - CRON_PATH="/etc/cron.d/nginx" + CRON_PATH="/etc/cron.d/bunkerized-nginx" fi do_and_check_cmd cp "$CRON_SRC" "$CRON_PATH" do_and_check_cmd chown root:nginx "$CRON_PATH" diff --git a/helpers/uninstall.sh b/helpers/uninstall.sh index 894a288..690f6a1 100755 --- a/helpers/uninstall.sh +++ b/helpers/uninstall.sh @@ -64,16 +64,7 @@ sed -i "s@nginx ALL=(root:root) NOPASSWD: /opt/bunkerized-nginx/ui/linux.sh@@" / # Remove cron echo "[*] Remove cron" -if [ "$OS" = "debian" ] || [ "$OS" = "ubuntu" ] ; then - CRON_PATH="/var/spool/cron/crontabs/nginx" -elif [ "$OS" = "centos" ] ; then - CRON_PATH="/var/spool/cron/nginx" -elif [ "$OS" = "alpine" ] ; then - CRON_PATH="/etc/crontabs/nginx" -fi -if [ -e "$CRON_PATH" ] ; then - do_and_check_cmd rm -f "$CRON_PATH" -fi +do_and_check_cmd rm -f /etc/crond.d/bunkerized-nginx # Remove /opt/bunkerized-nginx if [ -e "/opt/bunkerized-nginx" ] ; then diff --git a/tests/Dockerfile-fedora b/tests/Dockerfile-fedora index 19efb67..f2850ff 100644 --- a/tests/Dockerfile-fedora +++ b/tests/Dockerfile-fedora @@ -13,4 +13,6 @@ rm -f /lib/systemd/system/anaconda.target.wants/*;\ rm -f /lib/systemd/system/*tmpfiles*;\ rm -f /lib/systemd/user/*tmpfiles*;\ find /lib/systemd/ -type f -iname "*.service" -exec rm -f {} \;;\ -find /etc/systemd/ -type f -iname "*.service" -exec rm -f {} \; +find /etc/systemd/ -type f -iname "*.service" -exec rm -f {} \;;\ +find /lib/systemd/ -type f -iname "*.timer" -exec rm -f {} \;;\ +find /etc/systemd/ -type f -iname "*.timer" -exec rm -f {} \; diff --git a/ui/templates/head.html b/ui/templates/head.html index a3719e5..a283ef3 100644 --- a/ui/templates/head.html +++ b/ui/templates/head.html @@ -5,7 +5,6 @@