Kill ports before restarting nginx

src/freedombone-addcert

@@ -186,6 +186,8 @@ function remove_cert_letsencrypt {
     rm "/etc/letsencrypt/renewal/${LETSENCRYPT_HOSTNAME}.conf"
 
     # restart the web server
+    fuser -k 80/tcp
+    fuser -k 443/tcp
     systemctl restart nginx
 }
 

src/freedombone-controlpanel

@@ -1877,6 +1877,8 @@ function add_clacks {
                     fi
                 done
 
+                fuser -k 80/tcp
+                fuser -k 443/tcp
                 systemctl restart nginx
 
                 dialog --title $"Add Clacks Overhead" \
@@ -1999,16 +2001,14 @@ function menu_top_level {
             2) menu_backup_restore;;
             3) menu_app_settings;;
             4) if ! /usr/local/bin/addremove; then
-                   if [ -d /etc/matrix ]; then
-                       systemctl restart matrix
-                       systemctl restart nginx
-                   fi
+                   fuser -k 80/tcp
+                   fuser -k 443/tcp
+                   systemctl restart nginx
                    any_key
                else
-                   if [ -d /etc/matrix ]; then
-                       systemctl restart matrix
-                       systemctl restart nginx
-                   fi
+                   fuser -k 80/tcp
+                   fuser -k 443/tcp
+                   systemctl restart nginx
                fi
                ;;
             5) logging_on_off;;

src/freedombone-renew-cert

@@ -132,6 +132,8 @@ function renew_startssl {
         sed -i "s|$HOSTNAME.crt|$HOSTNAME.bundle.crt|g" /etc/nginx/sites-available/$HOSTNAME
 
         echo $'Certificate installed'
+        fuser -k 80/tcp
+        fuser -k 443/tcp
         systemctl restart nginx
         return
     fi

src/freedombone-sec

@@ -183,12 +183,9 @@ function reset_tripwire {
                 ' | reset-tripwire
     echo ''
 
-    # Sometimes nginx fails to restart if matrix is installed
-    # Restart matrix first
-    if [ -d /etc/matrix ]; then
-        systemctl restart matrix
-        systemctl restart nginx
-    fi
+    fuser -k 80/tcp
+    fuser -k 443/tcp
+    systemctl restart nginx
 
     if [ -f "/var/lib/tripwire/${HOSTNAME}.twd" ]; then
         show_tripwire_verification_code
@@ -401,6 +398,8 @@ function change_website_settings {
             sed -i "s|ssl_ciphers .*|ssl_ciphers '$SSL_CIPHERS_MOBILE';|g" "$WEBSITES_DIRECTORY/$file"
         fi
     done
+    fuser -k 80/tcp
+    fuser -k 443/tcp
     systemctl restart nginx
     echo $'Web security settings changed'
 }
@@ -857,6 +856,8 @@ function update_ciphersuite {
             sed -i "s|ssl_ciphers .*|ssl_ciphers '$SSL_CIPHERS_MOBILE';|g" "$WEBSITES_DIRECTORY/$file"
         fi
     done
+    fuser -k 80/tcp
+    fuser -k 443/tcp
     systemctl restart nginx
     write_config_param "SSL_PROTOCOLS" "$RECOMMENDED_SSL_PROTOCOLS"
     write_config_param "SSL_CIPHERS" "$RECOMMENDED_SSL_CIPHERS"

src/freedombone-utils-android

@@ -38,6 +38,8 @@ function android_update_apps {
     # The FreedomBox app assumes a self-signed cert
     if [ ! -f "/etc/ssl/certs/${local_hostname}.crt" ]; then
         install_web_local_user_interface
+        fuser -k 80/tcp
+        fuser -k 443/tcp
         systemctl restart nginx
     fi
 

src/freedombone-utils-gnusocialtools

@@ -779,6 +779,8 @@ function gnusocial_use_classic {
     fi
     chown -R www-data:www-data "/var/www/${domain_name}/htdocs"
 
+    fuser -k 80/tcp
+    fuser -k 443/tcp
     systemctl restart nginx
 }
 
@@ -808,6 +810,8 @@ function gnusocial_use_qvitter {
     fi
     chown -R www-data:www-data "/var/www/${domain_name}/htdocs"
 
+    fuser -k 80/tcp
+    fuser -k 443/tcp
     systemctl restart nginx
     systemctl restart php7.0-fpm
 }
@@ -848,6 +852,8 @@ function gnusocial_use_pleroma {
     chmod +x static
     chown -R www-data:www-data "/var/www/${domain_name}/htdocs"
 
+    fuser -k 80/tcp
+    fuser -k 443/tcp
     systemctl restart nginx
 }
 

src/freedombone-utils-mesh

@@ -156,6 +156,8 @@ function mesh_create_app_downloads_page {
             systemctl stop cryptpad
             systemctl disable cryptpad
         fi
+        fuser -k 80/tcp
+        fuser -k 443/tcp
         systemctl restart nginx
     fi
     # Don't show the cryptpad icon on the desktop
@@ -451,6 +453,8 @@ function enable_mesh_seconary_wifi {
 
             if [ ! -L /etc/nginx/sites-enabled/cryptpad ]; then
                 ln -s /etc/nginx/sites-available/cryptpad /etc/nginx/sites-enabled/cryptpad
+                fuser -k 80/tcp
+                fuser -k 443/tcp
                 systemctl restart nginx
             fi
         fi

src/freedombone-utils-web

@@ -264,6 +264,8 @@ function create_letsencrypt_cert {
             echo $"Lets Encrypt failed for $SITE_DOMAIN_NAME"
             if [ -f "/etc/nginx/sites-available/$SITE_DOMAIN_NAME" ]; then
                 nginx_dissite "$SITE_DOMAIN_NAME"
+                fuser -k 80/tcp
+                fuser -k 443/tcp
                 systemctl restart nginx
             fi
             exit 682529