Browse Source

Remove expiry script if gs/pA is removed

Bob Mottram 6 years ago
parent
commit
03bfbc7a9f
3 changed files with 15 additions and 1 deletions
  1. 7
    0
      src/freedombone-app-gnusocial
  2. 7
    0
      src/freedombone-app-postactiv
  3. 1
    1
      src/freedombone-upgrade

+ 7
- 0
src/freedombone-app-gnusocial View File

616
         rm /usr/bin/gnusocial-firewall
616
         rm /usr/bin/gnusocial-firewall
617
     fi
617
     fi
618
 
618
 
619
+    if [ -f /etc/cron.daily/gnusocial-expire ]; then
620
+        rm /etc/cron.daily/gnusocial-expire
621
+    fi
622
+    if [ -f /usr/bin/gnusocial-expire-posts ]; then
623
+        rm /usr/bin/gnusocial-expire-posts
624
+    fi
625
+
619
     function_check remove_ddns_domain
626
     function_check remove_ddns_domain
620
     remove_ddns_domain "$GNUSOCIAL_DOMAIN_NAME"
627
     remove_ddns_domain "$GNUSOCIAL_DOMAIN_NAME"
621
 }
628
 }

+ 7
- 0
src/freedombone-app-postactiv View File

628
         rm /usr/bin/postactiv-firewall
628
         rm /usr/bin/postactiv-firewall
629
     fi
629
     fi
630
 
630
 
631
+    if [ -f /etc/cron.daily/postactiv-expire ]; then
632
+        rm /etc/cron.daily/postactiv-expire
633
+    fi
634
+    if [ -f /usr/bin/postactiv-expire-posts ]; then
635
+        rm /usr/bin/postactiv-expire-posts
636
+    fi
637
+
631
     function_check remove_ddns_domain
638
     function_check remove_ddns_domain
632
     remove_ddns_domain "$POSTACTIV_DOMAIN_NAME"
639
     remove_ddns_domain "$POSTACTIV_DOMAIN_NAME"
633
 }
640
 }

+ 1
- 1
src/freedombone-upgrade View File

61
     fi
61
     fi
62
 fi
62
 fi
63
 
63
 
64
-# upgrading file prevents USB canary from activating
64
+# upgrading file prevents USB canary or other jobs from activating
65
 if [ ! -f /tmp/.upgrading ]; then
65
 if [ ! -f /tmp/.upgrading ]; then
66
     touch /tmp/.upgrading
66
     touch /tmp/.upgrading
67
 fi
67
 fi