Fix issue that additional ip is not added to the system.

Author: ScIT-Raphael

CHANGELOG.md

@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 - Add a detection of web root for add .well-known acme challenge.
 - Rework Let's Encrypt acme staging to use hestia conform standard.
 - Fix if condition, use nginx for Let's Encrypt acme request if present.
+- Rework v-add-sys-ip, remove centos/redhat support and rework conditions.
 
 ## [1.0.4] - 2019-07-09 - Hotfix
 ### Bugfixes

bin/v-add-sys-ip

@@ -66,42 +66,28 @@ if [ -z "$sys_ip_check" ]; then
     /sbin/ip addr add $ip/$cidr dev $iface \
         broadcast $broadcast label $iface
 
-    # Adding RHEL/CentOS/Fedora/Amazon startup script
-    if [ -d "/etc/sysconfig" ]; then
-        sys_ip="# Added by hestia"
-        sys_ip="$sys_ip\nDEVICE=$iface"
-        sys_ip="$sys_ip\nBOOTPROTO=static"
-        sys_ip="$sys_ip\nONBOOT=yes"
-        sys_ip="$sys_ip\nIPADDR=$ip"
-        sys_ip="$sys_ip\nNETMASK=$netmask"
-        echo -e $sys_ip > /etc/sysconfig/network-scripts/ifcfg-$iface
-    fi
-
-    # Adding Debian/Ubuntu startup script
-    if [ -e "/etc/debian_version" ]; then
-        if dpkg-query -W -f'${Status}' "netplan*" 2>/dev/null | grep -q "ok installed"; then
-            if [ -f "/etc/netplan/60-hestia.yaml" ]; then
-                sys_ip="        - $ip/$cidr"
-            else
-                sys_ip="# Added by hestia, please do not edit the file manually!"
-                sys_ip="$sys_ip\nnetwork:"
-                sys_ip="$sys_ip\n  version: 2"
-                sys_ip="$sys_ip\n  renderer: networkd"
-                sys_ip="$sys_ip\n  ethernets:"
-                sys_ip="$sys_ip\n    eth0:"
-                sys_ip="$sys_ip\n      addresses:"
-                sys_ip="$sys_ip\n        - $ip/$cidr"
-            fi
-            IFS='%'
-            echo -e $sys_ip >> /etc/netplan/60-hestia.yaml
+    if dpkg-query -W -f'${Status}' "netplan*" 2>/dev/null | grep -q "ok installed"; then
+        if [ -f "/etc/netplan/60-hestia.yaml" ]; then
+            sys_ip="        - $ip/$cidr"
         else
-            sys_ip="\n# Added by hestia"
-            sys_ip="$sys_ip\nauto $iface"
-            sys_ip="$sys_ip\niface $iface inet static"
-            sys_ip="$sys_ip\naddress $ip"
-            sys_ip="$sys_ip\nnetmask $netmask"
-            echo -e $sys_ip >> /etc/network/interfaces
+            sys_ip="# Added by hestia, please do not edit the file manually!"
+            sys_ip="$sys_ip\nnetwork:"
+            sys_ip="$sys_ip\n  version: 2"
+            sys_ip="$sys_ip\n  renderer: networkd"
+            sys_ip="$sys_ip\n  ethernets:"
+            sys_ip="$sys_ip\n    eth0:"
+            sys_ip="$sys_ip\n      addresses:"
+            sys_ip="$sys_ip\n        - $ip/$cidr"
         fi
+        IFS='%'
+        echo -e $sys_ip >> /etc/netplan/60-hestia.yaml
+    else
+        sys_ip="\n# Added by hestia"
+        sys_ip="$sys_ip\nauto $iface"
+        sys_ip="$sys_ip\niface $iface inet static"
+        sys_ip="$sys_ip\naddress $ip"
+        sys_ip="$sys_ip\nnetmask $netmask"
+        echo -e $sys_ip >> /etc/network/interfaces
     fi
 fi