Merge pull request #163 from 21pages/uninstall

uninstall /etc/nginx/conf.d/rustdesk.conf

install.sh

@@ -401,10 +401,21 @@ Do you want to install Certbot with snap? (recommended)"
         fi
 
         # Add Nginx config
-        if [ ! -f "/etc/nginx/sites-available/rustdesk.conf" ]
+        if [ -d "/etc/nginx/sites-available" ] && [ -d "/etc/nginx/sites-enabled" ]
         then
-            touch "/etc/nginx/sites-available/rustdesk.conf"
+            SITES_CONF_DIR="sites-available"
-            cat << NGINX_RUSTDESK_CONF > "/etc/nginx/sites-available/rustdesk.conf"
+        elif [ -d "/etc/nginx/conf.d" ]
+        then
+            SITES_CONF_DIR="conf.d"
+        else
+            msg_box "Couldn't find the Nginx config directory. Please check your system!"
+            exit 1
+        fi
+
+        if [ ! -f "/etc/nginx/$SITES_CONF_DIR/rustdesk.conf" ]
+        then
+            touch "/etc/nginx/$SITES_CONF_DIR/rustdesk.conf"
+            cat << NGINX_RUSTDESK_CONF > "/etc/nginx/$SITES_CONF_DIR/rustdesk.conf"
 server {
   server_name ${RUSTDESK_DOMAIN};
       location / {
@@ -417,7 +428,7 @@ NGINX_RUSTDESK_CONF
         fi
 
         # Enable the Nginx config file
-        if [ ! -f /etc/nginx/sites-enabled/rustdesk.conf ]
+        if [ "$SITES_CONF_DIR" = "sites-available" ] && [ ! -f /etc/nginx/sites-enabled/rustdesk.conf ]
         then
             ln -s /etc/nginx/sites-available/rustdesk.conf /etc/nginx/sites-enabled/rustdesk.conf
         fi

restore.sh

@@ -272,9 +272,18 @@ server {
 }
 EOF
 )"
-echo "${rustdesknginx}" | sudo tee /etc/nginx/sites-available/rustdesk.conf >/dev/null
 
-sudo ln -s /etc/nginx/sites-available/rustdesk.conf /etc/nginx/sites-enabled/rustdesk.conf
+if [ -d "/etc/nginx/sites-available" ] && [ -d "/etc/nginx/sites-enabled" ]
+then
+    echo "${rustdesknginx}" | sudo tee /etc/nginx/sites-available/rustdesk.conf >/dev/null
+    sudo ln -s /etc/nginx/sites-available/rustdesk.conf /etc/nginx/sites-enabled/rustdesk.conf
+elif [ -d "/etc/nginx/conf.d" ]
+then
+    echo "${rustdesknginx}" | sudo tee /etc/nginx/conf.d/rustdesk.conf >/dev/null
+else
+    msg_box "Couldn't find the Nginx config directory. Please check your system!"
+    exit 1
+fi
 
 sudo ufw allow 80/tcp
 sudo ufw allow 443/tcp

uninstall.sh

@@ -153,7 +153,7 @@ then
     ufw delete allow 21115:21119/tcp
     # ufw delete 22/tcp # If connected to a remote VPS, this deletion will make the connection go down
     ufw delete allow 21116/udp
-    if [ -f "/etc/nginx/sites-available/rustdesk.conf" ]
+    if [ -f "/etc/nginx/sites-available/rustdesk.conf" ] || [ -f "/etc/nginx/conf.d/rustdesk.conf" ]
     then
         ufw delete allow 80/tcp
         ufw delete allow 443/tcp
@@ -212,6 +212,7 @@ if [ -n "$REMOVE_NGINX_CONF" ]
 then
     rm -f "/etc/nginx/sites-available/rustdesk.conf"
     rm -f "/etc/nginx/sites-enabled/rustdesk.conf"
+    rm -f "/etc/nginx/conf.d/rustdesk.conf"
     service nginx restart
 elif [ -n "$REMOVE_NGINX_ALL" ]
 then