Add support for netplan ip configuration.

Author: ScIT-Raphael

bin/v-add-sys-ip

@@ -73,12 +73,29 @@ if [ -z "$sys_ip_check" ]; then
 
     # Adding Debian/Ubuntu startup script
     if [ -e "/etc/debian_version" ]; then
-        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
+        if [ -d "/etc/netplan" ]; then
+            if [ -f "/etc/netplan/60-hestia.yaml" ]; then
+                sys_ip="        - $ip/$cidr"
+            else
+                sys_ip="\n# Added by hestia"
+                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
 fi
 

bin/v-delete-sys-ip

@@ -64,11 +64,18 @@ fi
 
 # Deleting startup conf on Debian/Ubuntu
 if [ -e "/etc/network/interfaces" ]; then
-    ip_str=$(grep -n $ip$ /etc/network/interfaces |cut -f1 -d:)
-    if [ ! -z "$ip_str" ]; then
-        first_str=$((ip_str - 3))
-        last_str=$((ip_str + 1))
-        sed -i "$first_str,$last_str d" /etc/network/interfaces
+    if [ -f "/etc/netplan/60-hestia.yaml" ]; then
+        sed "/$ip/d" /etc/netplan/60-hestia.yaml
+        if ! grep -q '-' /etc/netplan/60-hestia.yaml; then
+            rm /etc/netplan/60-hestia.yaml
+        fi
+    else
+        ip_str=$(grep -n $ip$ /etc/network/interfaces |cut -f1 -d:)
+        if [ ! -z "$ip_str" ]; then
+            first_str=$((ip_str - 3))
+            last_str=$((ip_str + 1))
+            sed -i "$first_str,$last_str d" /etc/network/interfaces
+        fi
     fi
 fi