Merge branch 'main' into migrate-pecl-to-os-packages

Author: enoch85

lib.sh

@@ -2318,17 +2318,24 @@ fi
 # Clone or refresh local backup of repository
 # This runs during update to keep a fresh copy as fallback
 ensure_local_backup_repo() {
-    local BACKUP_REPO="/var/scripts/vm-repo-backup"
+    local BACKUP_REPO="$SCRIPTS/vm-repo-backup"
 
-    # Install git if needed
+    # Check if we can reach GitHub before deleting existing backup
+    if ! site_200 github.com
+    then
+        print_text_in_color "$IYellow" "Cannot reach GitHub - keeping existing local backup"
+        return 1
+    fi
+    
+    # Install git if needed (after confirming we have internet)
     install_if_not git
 
     # Remove old clone and get fresh copy
     print_text_in_color "$ICyan" "Creating local backup of repository (in case of network issues)..."
     rm -rf "$BACKUP_REPO"
 
-    # Clone with timeout, don't fail if it doesn't work
-    if timeout 120 git clone --depth 1 --branch main \
+    # Clone repository
+    if git clone --depth 1 --branch main \
         https://github.com/nextcloud/vm.git "$BACKUP_REPO" &>/dev/null
     then
         chmod -R +rx "$BACKUP_REPO"
@@ -2346,7 +2353,7 @@ try_local_backup() {
     local url="$1"
     local file="$2"
     local dest_dir="$3"
-    local BACKUP_REPO="/var/scripts/vm-repo-backup"
+    local BACKUP_REPO="$SCRIPTS/vm-repo-backup"
 
     # Check if backup exists
     if [ ! -d "$BACKUP_REPO" ]

menu/additional_apps.sh

@@ -46,7 +46,7 @@ $CHECKLIST_GUIDE\n\n$RUN_LATER_GUIDE" "$WT_HEIGHT" "$WT_WIDTH" 4 \
 "Webmin" "(Server GUI like Cpanel)" OFF \
 "Talk" "(Video calls and chat for Nextcloud - requires port 3478)" "$STARTUP_SWITCH" \
 "SMB-mount" "(Mount SMB-shares from your local network)" OFF \
-"Adminer" "(PostgreSQL GUI)" OFF \
+"AdminNeo" "(PostgreSQL GUI)" OFF \
 "LDAP" "(Windows Active directory for Nextcloud)" OFF \
 "Notify Push" "(High Performance Files Backend for Nextcloud)" OFF \
 "Netdata" "(Real-time server monitoring in Web GUI)" OFF \
@@ -71,8 +71,8 @@ case "$choice" in
         print_text_in_color "$ICyan" "Downloading the Fail2ban Menu..."
         run_script MENU fail2ban_menu
     ;;&
-    *"Adminer"*)
-        print_text_in_color "$ICyan" "Downloading the Adminer script..."
+    *"AdminNeo"*)
+        print_text_in_color "$ICyan" "Downloading the AdminNeo script..."
         run_script APP adminer
     ;;&
     *"ClamAV"*)

network/ddclient-configuration.sh

@@ -43,6 +43,8 @@ fi
 
 # Install curl for ddclient to work around 3.10.0 parsing bug (see #2754)
 install_if_not curl
+# Also ensure curl is installed before ddclient installation
+apt-get install curl -y
 DEBIAN_FRONTEND=noninteractive apt-get install ddclient -y
 
 # Test if file exists
@@ -76,6 +78,7 @@ case "$choice" in
         PROTOCOL="cloudflare"
         SERVER="www.cloudflare.com"
         USE_SSL="yes"
+        USE_ZONE="yes"
     ;;
     "deSEC")
         PROVIDER="deSEC"
@@ -179,10 +182,10 @@ cat << DDCLIENT_CONF > "/etc/ddclient.conf"
 # /etc/ddclient.conf
 
 # Default system settings
-use=if, if=$IFACE
 use=web, web=https://api.ipify.org
 
-# Work around ddclient 3.10.0+ parsing bug by using curl
+# Workaround for ddclient 3.10.0+ parsing bug disabled
+# The 'curl=yes' option causes "curl not found" errors even with curl installed
 # See: https://github.com/ddclient/ddclient/issues/499
 # and: https://github.com/nextcloud/vm/issues/2754
 # curl=yes
@@ -198,18 +201,22 @@ login=$LOGIN
 password=$PASSWORD
 
 # Hostname follows:
-zone=$HOSTNAME
-$HOSTNAME
 DDCLIENT_CONF
 
+if [ "$USE_ZONE" = "yes" ]
+then
+    echo "zone=$HOSTNAME" >> /etc/ddclient.conf
+fi
+echo "$HOSTNAME" >> /etc/ddclient.conf
+
 # Test connection
 msg_box "Everything is set up by now and we will check the connection."
 if ! ddclient -verbose
 then
     msg_box "Something failed while testing the DDNS update.
 Please try again by running this script again!"
+    exit 1
 else
     msg_box "Congratulations, it seems like the initial DDNS update worked!
 DDclient is now set up correctly!"
 fi
-exit

nextcloud_install_production.sh

@@ -116,7 +116,7 @@ Enabling this will also force an automatic reboot after running the update scrip
             print_text_in_color "$ICyan" "Creating volume..."
             sleep 1
             # Create a placeholder snapshot
-            check_command lvcreate --size 10G --name "NcVM-installation" ubuntu-vg
+            check_command lvcreate --size 5G --name "NcVM-installation" ubuntu-vg
             export SNAPSHOTS_ENABLED="yes"
         else
             print_text_in_color "$IRed" "Could not create volume because of insufficient space..."