Ubuntu 22.04 (#2279)

Signed-off-by: enoch85 <[email protected]>

Author: enoch85

README.md

@@ -17,12 +17,12 @@ Server installation. Simplified. :cloud:
 --------------------
 
 ## Dependencies:
-(Ubuntu Server 20.04 LTS 64-bit)
+(Ubuntu Server 22.04 LTS 64-bit)
 <br>
-(Linux Kernel: 5.4)
+(Linux Kernel: 5.15)
 - Apache 2.4
-- PostgreSQL 12
-- PHP-FPM 7.4
+- PostgreSQL 14
+- PHP-FPM 8.1
 - Redis Memcache (latest stable version from PECL)
 - PHP-igbinary (latest stable version from PECL
 - PHP-smbclient (latest stable version from PECL)

addons/0-byte-files.sh

@@ -48,4 +48,6 @@ Please see files in red when you hit OK."
     do
       print_text_in_color "$IRed" "$each"
     done
+else
+    msg_box "No 0-byte files found. *peew*"
 fi

addons/fix_invalid_modification_time.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# T&M Hansson IT AB © - 2022, https://www.hanssonit.se/
+
+true
+SCRIPT_NAME="Fix 'Could not update metadata due to invalid modified time'."
+# shellcheck source=lib.sh
+source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
+
+# Check if root
+root_check
+
+msg_box "This is an attempt to automate a fix for the nasty bug from the Desktop Client:
+https://github.com/nextcloud/desktop/wiki/How-to-fix-the-error-invalid-or-negative-modification-date#-how-to-fix-it
+
+Please only run this if you made a backup."
+
+if ! yesno_box_no "Have you made a backup?"
+then
+    exit 1
+fi
+
+msg_box "OK, let's go! 
+
+Please note, this script might take several hours to run, depening on the size of your datadir. Don't abort it!"
+
+# Download the script
+curl_to_dir https://raw.githubusercontent.com/nextcloud-gmbh/mtime_fixer_tool_kit/master solvable_files.sh $NCPATH
+
+# Run all the needed variables
+ncdb
+
+if [[ $NCDBTYPE = mysql ]]
+then
+    msg_box "We only support PostgreSQL, sorry!"
+    exit
+fi
+
+# Run the script and remove it
+print_text_in_color "$ICyan" "Running the scan and fixing broken files..."
+bash "$NCPATH"/solvable_files.sh "$NCDATA" "$NCDBTYPE" "$NCDBHOST" "$NCDBUSER" "$NCDBPASS" "$NCDB" fix use_birthday verbose
+rm "$NCPATH"/solvable_files.sh
+
+# Scan all files
+nextcloud_occ files:scan --all

addons/redis-server-ubuntu.sh

@@ -16,9 +16,9 @@ debug_mode
 root_check
 
 # Check Ubuntu version
-if ! version 16.04 "$DISTRO" 20.04.6
+if ! version 18.04 "$DISTRO" 22.04.10
 then
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 16.04 - 20.04.6 to run this script."
+    msg_box "Your current Ubuntu version is $DISTRO but must be between 18.04 - 22.04.10 to run this script."
     msg_box "Please contact us to get support for upgrading your server:
 https://www.hanssonit.se/#contact
 https://shop.hanssonit.se/"

addons/security.sh

@@ -73,6 +73,9 @@ a2enmod reqtimeout # http://httpd.apache.org/docs/2.4/mod/mod_reqtimeout.html
 # Download the spamhaus script
 download_script STATIC spamhaus-drop
 
+# Install iptables
+install_if_not iptables
+
 # Make the file executable
 chmod +x "$SCRIPTS"/spamhaus-drop.sh
 

apps/adminer.sh

@@ -56,7 +56,7 @@ curl_to_dir "https://raw.githubusercontent.com/Niyko/Hydra-Dark-Theme-for-Admine
 ln -s "$ADMINERDIR"/latest.php "$ADMINERDIR"/adminer.php
 
 # Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 20.04.10
+if version 20.04 "$DISTRO" 22.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/collabora_docker.sh

@@ -135,7 +135,7 @@ a2enmod ssl
 a2enmod headers
 
 # Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 20.04.10
+if version 20.04 "$DISTRO" 22.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/fail2ban.sh

@@ -112,6 +112,9 @@ do
     fi
 done
 
+# Install iptables
+install_if_not iptables
+
 # remove ncdata, else it will be used
 rm -f $NCDATA/nextcloud.log
 

apps/fulltextsearch.sh

@@ -36,7 +36,7 @@ else
     # Ask for removal or reinstallation
     reinstall_remove_menu "$SCRIPT_NAME"
     # Reset database table
-    check_command sudo -Hiu postgres psql "$NCCONFIGDB" -c "TRUNCATE TABLE oc_fulltextsearch_ticks;"
+    check_command sudo -Hiu postgres psql "$NCDB" -c "TRUNCATE TABLE oc_fulltextsearch_ticks;"
     # Reset Full Text Search to be able to index again, and also remove the app to be able to install it again
     nextcloud_occ_no_check fulltextsearch:reset
     APPS=(fulltextsearch fulltextsearch_elasticsearch files_fulltextsearch)

apps/onlyoffice_docker.sh

@@ -147,7 +147,7 @@ a2enmod ssl
 a2enmod headers
 
 # Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 20.04.10
+if version 20.04 "$DISTRO" 22.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/pico_cms.sh

@@ -215,7 +215,7 @@ a2enmod ssl
 a2enmod headers
 
 # Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 20.04.10
+if version 20.04 "$DISTRO" 22.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/talk.sh

@@ -65,8 +65,8 @@ else
     removal_popup "$SCRIPT_NAME"
 fi
 
-# Must be 20.04
-if ! version 20.04 "$DISTRO" 20.04.6
+# Must be 22.04
+if ! version 20.04 "$DISTRO" 22.04.10
 then
     msg_box "Your current Ubuntu version is $DISTRO but must be between 20.04 - 20.04.10 to install Talk"
     msg_box "Please contact us to get support for upgrading your server:
@@ -76,7 +76,7 @@ exit
 fi
 
 # Nextcloud 19 is required.
-lowest_compatible_nc 19
+lowest_compatible_nc 20
 
 ####################### TALK (COTURN)
 
@@ -333,7 +333,7 @@ echo "Hi there! :) If you see this page, the Apache2 proxy for $SCRIPT_NAME is u
 chown -R www-data:www-data /var/www/html/error
 
 # Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 20.04.10
+if version 20.04 "$DISTRO" 22.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/tmbitwarden.sh

@@ -242,7 +242,7 @@ a2enmod headers
 a2enmod remoteip
 
 # Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 20.04.10
+if version 20.04 "$DISTRO" 22.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/vaultwarden.sh

@@ -123,7 +123,7 @@ a2enmod headers
 a2enmod remoteip
 
 # Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 20.04.10
+if version 20.04 "$DISTRO" 22.04.10
 then
     TLS13="+TLSv1.3"
 fi

apps/webmin.sh

@@ -50,7 +50,6 @@ install_if_not libpam-runtime
 install_if_not libio-pty-perl
 install_if_not apt-show-versions
 install_if_not python2
-install_if_not python
 install_if_not unzip
 install_if_not zip
 
@@ -71,8 +70,8 @@ install_if_not webmin
 
 if ! dpkg-query -W -f='${Status}' "webmin" | grep -q "ok installed"
 then
-    wget http://prdownloads.sourceforge.net/webadmin/webmin_1.984_all.deb
-    dpkg --install webmin_1.984_all.deb
+    wget http://prdownloads.sourceforge.net/webadmin/webmin_1.991_all.deb
+    dpkg --install webmin_1.991_all.deb
 fi
 
 print_text_in_color "$ICyan" "Configuring Webmin..."

disk/format-chosen.sh

@@ -10,7 +10,7 @@ source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercont
 # Check if root
 root_check
 
-# Needs to be Ubuntu 18.04 and Multiverse
+# Needs to be Ubuntu 20.04 and Multiverse
 check_distro_version
 check_multiverse
 

disk/format-sdb.sh

@@ -10,7 +10,7 @@ source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercont
 # Check if root
 root_check
 
-# Needs to be Ubuntu 18.04 and Multiverse
+# Needs to be Ubuntu 20.04 and Multiverse
 check_distro_version
 check_multiverse
 

lets-encrypt/activate-tls.sh

@@ -116,7 +116,7 @@ fi
 check_php
 
 # Only add TLS 1.3 on Ubuntu later than 20.04
-if version 20.04 "$DISTRO" 20.04.10
+if version 20.04 "$DISTRO" 22.04.10
 then
     TLS13="+TLSv1.3"
 fi

lib.sh

@@ -8,6 +8,15 @@
 true
 # see https://github.com/koalaman/shellcheck/wiki/Directive
 
+##### LEGACY #####
+## Remove 2022-09-01
+NCPASS=nextcloud
+NCUSER=ncadmin
+PGDB_USER=nextcloud_db_user
+NCCONFIGDBPASS=$(grep 'dbpassword "$NCPATH"/config/config.php | awk '{print $3}' | sed "s/[',]//g")"
+NCCONFIGDB=$(grep 'dbname' "$NCPATH"/config/config.php | awk '{print $3}' | sed "s/[',]//g")"
+
+
 ## VARIABLES
 
 # Dirs
@@ -41,7 +50,7 @@ gen_passwd() {
 DISTRO=$(lsb_release -sr)
 KEYBOARD_LAYOUT=$(localectl status | grep "Layout" | awk '{print $3}')
 # Hypervisor
-# HYPERVISOR=$(dmesg --notime | grep -i hypervisor | cut -d ':' -f2 | head -1 | tr -d ' ') TODO
+###  TODO ### HYPERVISOR=$(dmesg --notime | grep -i hypervisor | cut -d ':' -f2 | head -1 | tr -d ' ')
 SYSVENDOR=$(cat /sys/devices/virtual/dmi/id/sys_vendor)
 # Network
 IFACE=$(ip r | grep "default via" | awk '{print $5}')
@@ -103,8 +112,8 @@ GEOBLOCKDAT="$GITHUB_REPO/geoblockdat"
 NCREPO="https://download.nextcloud.com/server/releases"
 ISSUES="https://github.com/nextcloud/vm/issues"
 # User information
-NCPASS=nextcloud
-NCUSER=ncadmin
+GUIUSER=ncadmin
+GUIPASS=nextcloud
 UNIXUSER=$SUDO_USER
 UNIXUSER_PROFILE="/home/$UNIXUSER/.bash_profile"
 ROOT_PROFILE="/root/.bash_profile"
@@ -113,16 +122,16 @@ BITWARDEN_USER=bitwarden
 BITWARDEN_HOME=/home/"$BITWARDEN_USER"
 # Database
 SHUF=$(shuf -i 25-29 -n 1)
+PGDB_USER=nextcloud_db_user
 PGDB_PASS=$(gen_passwd "$SHUF" "a-zA-Z0-9@#*")
 NEWPGPASS=$(gen_passwd "$SHUF" "a-zA-Z0-9@#*")
 ncdb() {
-    NCCONFIGDB=$(grep "dbname" $NCPATH/config/config.php | awk '{print $3}' | sed "s/[',]//g")
-}
-[ -n "$NCDB" ] && ncdb # TODO: remove this line someday
-ncdbpass() {
-    NCCONFIGDBPASS=$(grep "dbpassword" $NCPATH/config/config.php | awk '{print $3}' | sed "s/[',]//g")
+    NCDB=$(grep "dbname" $NCPATH/config/config.php | awk '{print $3}' | sed "s/[',]//g")
+    NCDBPASS=$(grep "dbpassword" $NCPATH/config/config.php | awk '{print $3}' | sed "s/[',]//g")
+    NCDBUSER=$(grep "dbuser" $NCPATH/config/config.php | awk '{print $3}' | sed "s/[',]//g")
+    NCDBTYPE=$(grep "dbtype" /var/www/nextcloud/config/config.php | awk '{print $3}' | sed "s/[',]//g")
+    NCDBHOST=$(grep "dbhost" /var/www/nextcloud/config/config.php | awk '{print $3}' | sed "s/[',]//g")
 }
-[ -n "$NCDBPASS" ] && ncdbpass # TODO: remove this line someday
 # Path to specific files
 SECURE="$SCRIPTS/setup_secure_permissions_nextcloud.sh"
 # Nextcloud version
@@ -134,7 +143,6 @@ nc_update() {
     NCBAD=$((NCMAJOR-2))
     NCNEXT="$((${CURRENTVERSION%%.*}+1))"
 }
-[ -n "$NC_UPDATE" ] && nc_update # TODO: remove this line someday
 # Set the hour for automatic updates. This would be 18:00 as only the hour is configurable.
 AUT_UPDATES_TIME="18"
 # Keys
@@ -151,7 +159,7 @@ HTTP_CONF="nextcloud_http_domain_self_signed.conf"
 HTTPS_CONF="$SITES_AVAILABLE/$SUBDOMAIN.conf"
 HTTP2_CONF="/etc/apache2/mods-available/http2.conf"
 # PHP-FPM
-PHPVER=7.4
+PHPVER=8.1
 PHP_FPM_DIR=/etc/php/$PHPVER/fpm
 PHP_INI=$PHP_FPM_DIR/php.ini
 PHP_POOL_DIR=$PHP_FPM_DIR/pool.d
@@ -200,7 +208,6 @@ turn_install() {
     NC_SECRET=$(gen_passwd "$SHUF" "a-zA-Z0-9@#*")
     SIGNALING_SERVER_CONF=/etc/signaling/server.conf
 }
-[ -n "$TURN_INSTALL" ] && turn_install # TODO: remove this line someday
 
 ## FUNCTIONS
 
@@ -691,10 +698,10 @@ version(){
 
     [[ $2 != "$h" && $2 != "$t" ]]
 }
-if ! version 18.04 "$DISTRO" 20.04.10
+if ! version 20.04 "$DISTRO" 22.04.10
 then
     print_text_in_color "$IRed" "Your current Ubuntu version is $DISTRO but must be between \
-18.04 - 20.04.10 to run this script."
+20.04 - 22.04.10 to run this script."
     print_text_in_color "$ICyan" "Please contact us for support upgrading your server:"
     print_text_in_color "$ICyan" "https://www.hanssonit.se/#contact"
     print_text_in_color "$ICyan" "https://shop.hanssonit.se/"
@@ -1020,13 +1027,13 @@ remove_from_trusted_domains() {
 
 check_distro_version() {
 # Check Ubuntu version
-if lsb_release -sc | grep -ic "bionic" &> /dev/null || lsb_release -sc | grep -ic "focal" &> /dev/null
+if lsb_release -sc | grep -ic "jammy" &> /dev/null || lsb_release -sc | grep -ic "bionic" &> /dev/null
 then
     OS=1
 elif lsb_release -i | grep -ic "Ubuntu" &> /dev/null
 then
     OS=1
-elif uname -a | grep -ic "bionic" &> /dev/null || uname -a | grep -ic "focal" &> /dev/null
+elif uname -a | grep -ic "jammy" &> /dev/null || uname -a | grep -ic "bionic" &> /dev/null
 then
     OS=1
 elif uname -v | grep -ic "Ubuntu" &> /dev/null
@@ -1043,8 +1050,8 @@ You can find the download link here: https://www.ubuntu.com/download/server"
     exit 1
 fi
 
-if ! version 18.04 "$DISTRO" 20.04.10; then
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 18.04 - 20.04.10 to run this script."
+if ! version 20.04.10 "$DISTRO" 22.04.10; then
+    msg_box "Your current Ubuntu version is $DISTRO but must be between 20.04 - 22.04.10 to run this script."
     msg_box "Please contact us to get support for upgrading your server:
 https://www.hanssonit.se/#contact
 https://shop.hanssonit.se/"
@@ -1096,7 +1103,7 @@ then
 
 To bypass this check, comment out (add # before the line) 'ram_check X' in the script that you are trying to run.
 
-In nextcloud_install_production.sh you can find the check somewhere around line #98.
+In nextcloud_install_production.sh you can find the check somewhere around line #48.
 
 Please note this may affect performance. USE AT YOUR OWN RISK!"
     exit 1
@@ -1169,7 +1176,7 @@ version(){
 
     [[ $2 != "$h" && $2 != "$t" ]]
 }
-if version 18.04 "$DISTRO" 20.04.10
+if version 20.04 "$DISTRO" 22.04.10
 then
     print_text_in_color "$ICyan" "Testing if network is OK..."
     if site_200 github.com
@@ -1194,7 +1201,7 @@ then
         fi
     fi
 else
-    msg_box "Your current Ubuntu version is $DISTRO but must be between 18.04 - 20.04.10 to run this script."
+    msg_box "Your current Ubuntu version is $DISTRO but must be between 20.04 - 22.04.10 to run this script."
     msg_box "Please contact us to get support for upgrading your server:
 https://www.hanssonit.se/#contact
 https://shop.hanssonit.se/"