Kill ports before restarting nginx

src/freedombone-logging

@@ -252,10 +252,6 @@ if [ -d /etc/tor ]; then
         systemctl restart tor
     fi
 fi
-if [ -d /etc/nginx ]; then
-    systemctl restart php7.0-fpm
-    systemctl restart nginx
-fi
 if [ -f /etc/init.d/spamassassin ]; then
     systemctl restart spamassassin
 fi
@@ -278,4 +274,9 @@ if [ -d /etc/postgresql ]; then
     systemctl restart postgresql
 fi
 
+fuser -k 80/tcp
+fuser -k 443/tcp
+systemctl restart php7.0-fpm
+systemctl restart nginx
+
 exit 0

src/freedombone-upgrade

@@ -132,13 +132,6 @@ fi
 # If logging was left on then turn it off
 ${PROJECT_NAME}-logging off
 
-# This is a hack to fix nginx failures which happen sometimes
-# when matrix is installed
-if [ -d /etc/matrix ]; then
-    systemctl restart matrix
-    systemctl restart nginx
-fi
-
 # upgrading file prevents USB canary from activating
 if [ -f /tmp/.upgrading ]; then
     rm /tmp/.upgrading