diff --git a/cease.sh b/cease.sh index 24549b9..b9769b5 100755 --- a/cease.sh +++ b/cease.sh @@ -40,7 +40,9 @@ if vmctl show ${1%.txt} >/dev/null 2>&1; then dig +short -x $(grep -A2 ${1%.txt} /etc/dhcpd.conf | awk '/fixed/ {print $2}' | tr -d ';') remove.pl ${1} deploy.pl - rcctl restart dhcpd + if [[ -z ${DHCPD} ]]; then + rcctl restart dhcpd + fi vmctl reload fi fi @@ -51,6 +53,8 @@ elif [[ "${SERVER}" == mega* ]]; then HOST="m${SERVER#mega}" fi -openrsync -va --del /home/mischa/vms/ mischa@wm1.obsda.ms:vms/${HOST}/ -ssh wm1.obsda.ms "doas userdel -r ${HOST}${1%.txt} && doas groupdel ${HOST}${1%.txt}" -openrsync -va --del /home/mischa/vms/ mischa@rx.high5.nl:vms/${HOST}/ +if [[ "${SERVER}" == server* ]] || [[ "${SERVER}" == mega* ]]; then + openrsync -va --del /home/mischa/vms/ mischa@wm1.obsda.ms:vms/${HOST}/ + ssh wm1.obsda.ms "doas userdel -r ${HOST}${1%.txt} && doas groupdel ${HOST}${1%.txt}" + openrsync -va --del /home/mischa/vms/ mischa@rx.high5.nl:vms/${HOST}/ +fi