chore: merge develop into master

Author: ItsANameToo

app/Domain/Server/Services/Providers/AWS.php

@@ -352,7 +352,7 @@ public function deleteSecureShellKey(string $id): bool
      */
     public function getImageId(): string
     {
-        return 'Ubuntu 18.04 x64';
+        return 'Ubuntu 22.04 x64';
     }
 
     /**

app/Domain/Server/Services/Providers/DigitalOcean.php

@@ -336,7 +336,7 @@ public function deleteSecureShellKey(string $id): bool
      */
     public function getImageId(): string
     {
-        return 'ubuntu-18-04-x64';
+        return 'ubuntu-22-04-x64';
     }
 
     /**

app/Domain/Server/Services/Providers/Hetzner.php

@@ -350,7 +350,7 @@ public function deleteSecureShellKey(string $id): bool
      */
     public function getImageId(): string
     {
-        return 'ubuntu-18.04';
+        return 'ubuntu-22.04';
     }
 
     /**

app/Domain/Server/Services/Providers/Linode.php

@@ -323,7 +323,7 @@ public function deleteSecureShellKey(string $id): bool
      */
     public function getImageId(): string
     {
-        return 'linode/ubuntu18.04';
+        return 'linode/ubuntu22.04';
     }
 
     /**

app/Domain/Server/Services/Providers/Vultr.php

@@ -327,7 +327,7 @@ public function deleteSecureShellKey(string $id): bool
      */
     public function getImageId(): string
     {
-        return '270'; //'Ubuntu 18.04 x64';
+        return '270'; //'Ubuntu 22.04 x64';
     }
 
     /**

resources/views/scripts/ark/ark/manual/pre-install/await-apt-unlock.blade.php

@@ -1,7 +1,60 @@
 # Wait For Apt To Unlock
 
-while fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
-    echo "Waiting for other software managers to finish..."
+apt_wait () {
+    while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
+        echo "Waiting for dpkg/lock to be unlocked for sudo..."
 
-    sleep 1
-done
+        sleep 5
+    done
+
+    while sudo fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1 ; do
+        echo "Waiting: dpk for lock-frontend to be unlocked for sudo..."
+
+        sleep 5
+    done
+
+    while sudo fuser /var/lib/apt/lists/lock >/dev/null 2>&1 ; do
+        echo "Waiting for lists/lock to be unlocked for sudo..."
+
+        sleep 5
+    done
+
+    if [ -f /var/log/unattended-upgrades/unattended-upgrades.log ]; then
+        while sudo fuser /var/log/unattended-upgrades/unattended-upgrades.log >/dev/null 2>&1 ; do
+            echo "Waiting for unattended-upgrades to be unlocked for sudo..."
+
+            sleep 5
+        done
+    fi
+
+    while fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
+        echo "Waiting for dpkg/lock to be unlocked for user..."
+        sleep 5
+    done
+
+    while fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1 ; do
+        echo "Waiting for dpkg/lock-frontend to be unlocked for user..."
+        sleep 5
+    done
+
+    while fuser /var/lib/apt/lists/lock >/dev/null 2>&1 ; do
+        echo "Waiting for lists/lock to be unlocked for user..."
+        sleep 5
+    done
+
+    if [ -f /var/log/unattended-upgrades/unattended-upgrades.log ]; then
+        while fuser /var/log/unattended-upgrades/unattended-upgrades.log >/dev/null 2>&1 ; do
+            echo "Waiting for unattended-upgrades to be unlocked for user..."
+            sleep 5
+        done
+    fi
+}
+
+heading "Waiting for locks..."
+apt_wait
+
+sudo sed -i "s/#precedence ::ffff:0:0\/96  100/precedence ::ffff:0:0\/96  100/" /etc/gai.conf
+if [ -f /etc/needrestart/needrestart.conf ]; then
+    # Ubuntu 22 has this set to (i)nteractive, but we want (a)utomatic.
+    sudo sed -i "s/^#\$nrconf{restart} = 'i';/\$nrconf{restart} = 'a';/" /etc/needrestart/needrestart.conf
+fi

resources/views/scripts/ark/ark/manual/pre-install/deps-jemalloc.blade.php

@@ -1,5 +1,6 @@
 heading "Installing jemalloc..."
 
+apt_wait
 sudo apt-get install -y libjemalloc-dev
 
 success "Installed jemalloc!"

resources/views/scripts/ark/ark/manual/pre-install/deps-node.blade.php

@@ -3,9 +3,14 @@
 sudo rm -rf /usr/local/{lib/node{,/.npm,_modules},bin,share/man}/{npm*,node*,man1/node*}
 sudo rm -rf ~/{.npm,.forever,.node*,.cache,.nvm}
 
-sudo wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add -
-(echo "deb https://deb.nodesource.com/node_14.x $(lsb_release -s -c) main" | sudo tee /etc/apt/sources.list.d/nodesource.list)
+(echo -e "Package: nodejs\nPin: origin deb.nodesource.com\nPin-Priority: 999" | sudo tee /etc/apt/preferences.d/nodesource)
+curl -sL  https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | sudo tee /usr/share/keyrings/nodesource.gpg >/dev/null
+(echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x ${DEB_ID} main" | sudo tee /etc/apt/sources.list.d/nodesource.list)
+
+apt_wait
 sudo apt-get update
-sudo apt-get install nodejs -y
+
+apt_wait
+sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_MODE=a apt-get install nodejs -yq
 
 success "Installed node.js & npm!"

resources/views/scripts/ark/ark/manual/pre-install/deps-ntp.blade.php

@@ -2,6 +2,7 @@
 
 sudo timedatectl set-ntp off > /dev/null 2>&1 # disable the default systemd timesyncd service
 
+apt_wait
 sudo apt-get install ntp -yyq
 
 sudo ntpd -gq

resources/views/scripts/ark/ark/manual/pre-install/deps-pgsql.blade.php

@@ -1,6 +1,9 @@
 heading "Installing PostgreSQL..."
 
+apt_wait
 sudo apt-get update
+
+apt_wait
 sudo apt-get install postgresql postgresql-contrib -y
 
 success "Installed PostgreSQL!"