Remove expiry script if gs/pA is removed

This commit is contained in:
Bob Mottram 2018-06-09 09:59:47 +01:00
parent 25ecacc3fa
commit 03bfbc7a9f
3 changed files with 15 additions and 1 deletions

View File

@ -616,6 +616,13 @@ function remove_gnusocial {
rm /usr/bin/gnusocial-firewall
fi
if [ -f /etc/cron.daily/gnusocial-expire ]; then
rm /etc/cron.daily/gnusocial-expire
fi
if [ -f /usr/bin/gnusocial-expire-posts ]; then
rm /usr/bin/gnusocial-expire-posts
fi
function_check remove_ddns_domain
remove_ddns_domain "$GNUSOCIAL_DOMAIN_NAME"
}

View File

@ -628,6 +628,13 @@ function remove_postactiv {
rm /usr/bin/postactiv-firewall
fi
if [ -f /etc/cron.daily/postactiv-expire ]; then
rm /etc/cron.daily/postactiv-expire
fi
if [ -f /usr/bin/postactiv-expire-posts ]; then
rm /usr/bin/postactiv-expire-posts
fi
function_check remove_ddns_domain
remove_ddns_domain "$POSTACTIV_DOMAIN_NAME"
}

View File

@ -61,7 +61,7 @@ if [ $DEVELOPMENT_BRANCH ]; then
fi
fi
# upgrading file prevents USB canary from activating
# upgrading file prevents USB canary or other jobs from activating
if [ ! -f /tmp/.upgrading ]; then
touch /tmp/.upgrading
fi