Check if netplan file is created (hestiacp#2612)

* Check if netplan file is created

* Fix bug in netplan detection

* Fix bug in test

* Improve shellcheck code in cause major failure.

* Fix bug in v-add-sys-ip 

Improve output if shellcheck fails in first step

* Fix bug

* Fix bug in v-add-sys-ip

* Fix bug in test

* Add warning message for existing setups that match critera

Author: jaapmarcus

bin/v-add-sys-ip

@@ -75,9 +75,8 @@ if [ -z "$sys_ip_check" ]; then
         broadcast $broadcast label $iface
 
     # Check if netplan is in use and generate configuration file
-    if dpkg-query -W -f'${Status}' "netplan*" 2>/dev/null | grep -q "ok installed"; then 
-        result=$(cat /etc/netplan/*.yaml 2>/dev/null | grep $(hostname -I | cut -d' ' -f1));
-        if [ -n "$result" ]; then 
+    if [ ! -z $(which netplan) ]; then 
+        if  [ ! -z "$(netplan generate --mapping "$iface" | grep networkd)" ]; then   
             netplan=1
         else
             netplan=0

install/upgrade/versions/1.6.0.sh

@@ -95,6 +95,15 @@ if [ -f "/etc/cron.d/hestia-sftp" ]; then
     echo "@reboot root sleep 60 && /usr/local/hestia/bin/v-add-sys-sftp-jail > /dev/null" > /etc/cron.d/hestia-sftp
 fi
 
+ips=$(ls /usr/local/hestia/data/ips/ | wc -l)
+release=$(lsb_release -s -i);
+if [ $release = 'Ubuntu' ]; then 
+    if [ $ips -gt 1 ]; then
+        add_upgrade_message "Warning: Please check your network configuration!\n\n A bug has been discovered that might affect your setup and can lead to issues after a system reboot. Please review your network configuration. See https://github.com/hestiacp/hestiacp/pull/2612#issuecomment-1135571835 for more info regarding this issue!"
+        $HESTIA/bin/v-add-user-notification admin "Warning: Please check your network configuration!\n\n A bug has been discovered that might affect your setup and can lead to issues after a system reboot. Please review your network configuration. <a href='https://github.com/hestiacp/hestiacp/pull/2612#issuecomment-1135571835'>More info</a>"
+    fi
+fi
+
 if [ -d /etc/phpmyadmin/conf.d ]; then
     for file in /etc/phpmyadmin/conf.d/*; do
         if [ -z "$(grep -i 'information_schema' $file)" ]; then

test/shellcheck.sh

@@ -31,9 +31,19 @@ for file in $files; do
        printf "%s: \033[0;31m Fail \033[0m\n" "$file"
        err=1
     else 
+        # split loop in 2 parts allowing debuggin in earier stage
        printf "%s: \033[0;32m Success \033[0m\n" "$file"
-        shellcheck -x "$file" -e "SC2086,SC2002,SC2153,SC2181,SC2153,SC2129,SC2016,SC2196,SC1090,SC2031,SC2010,SC2143,SC2046" 
     fi
 done
 
+if [ $err == 1 ];
+then 
+exit "$err";
+fi
+
+for file in $files; do 
+    echo "Linting: $file"
+    shellcheck -x "$file" -e "SC2086,SC2002,SC2153,SC2181,SC2153,SC2129,SC2016,SC2196,SC1090,SC2031,SC2010,SC2143,SC2046" 
+done
+
 exit "$err";

test/test.bats

@@ -581,7 +581,31 @@ function check_ip_not_banned(){
         [ -f "$a2_rpaf" ] && assert_file_contains "$a2_rpaf" "RPAFproxy_ips.*$ip\b"
         [ -f "$a2_remoteip" ] && assert_file_contains "$a2_remoteip" "RemoteIPInternalProxy $ip\$"
     fi
+    
+}
+
+@test "Ip: [Ubuntu] Netplan file updated" {
+   # Skip if Debian
+   if [ $(lsb_release -s -i) != "Ubuntu" ]; then
+   skip
+   fi
+   
+   # Test will fail if systemd (For example Proxmox) is used for setting ip addresses. How ever there is no "decent" way to check if Netplan is used except via the method used in v-add-sys-ip and there for breaking the reason to test this. How ever if the test used in v-add-sys-ip fails it still should check if it exists!
+  
+   assert_file_exist /etc/netplan/60-hestia.yaml
+   
+   # also check if file contains the newly added ip
+   assert_file_contains /etc/netplan/60-hestia.yaml "$ip"
+}
 
+@test "Ip: [Debian] Netplan file updated" {
+   # Skip with netplan
+   if [ -f /etc/netplan/60-hestia.yaml ]; then
+   skip
+   fi
+   
+   assert_file_exist  /etc/network/interfaces
+   assert_file_contains  /etc/network/interfaces "$ip"
 }
 
 @test "Ip: Add ip (duplicate)" {