Merge remote-tracking branch 'upstream/main' into main_local

install/kimai-install.sh

@@ -24,12 +24,27 @@ $STD apt-get install -y \
   expect \
   composer \
   mariadb-server \
-  libapache2-mod-php \
-  php8.2-{mbstring,gd,intl,pdo,mysql,tokenizer,zip,xml} \
+  lsb-release \
   wget \
   openssh-server
 msg_ok "Installed Dependencies"
 
+msg_info "Setup PHP8.4 Repository"
+$STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
+$STD dpkg -i /tmp/debsuryorg-archive-keyring.deb
+$STD sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
+$STD apt-get update
+msg_ok "Setup PHP8.4 Repository"
+
+msg_info "Setup PHP"
+$STD apt-get remove -y php8.2*
+#$STD apt-get remove -y php8.3*
+$STD apt-get install -y \
+  php8.3 \
+  php8.3-{mbstring,gd,intl,common,mysql,zip,xml} \
+  libapache2-mod-php8.3
+msg_info "Setup PHP"
+
 msg_info "Setting up database"
 DB_NAME=kimai_db
 DB_USER=kimai
@@ -74,6 +89,7 @@ send "helper-scripts.com\r"
 
 expect eof
 EOF
+$STD composer update --no-interaction
 echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt"
 msg_ok "Installed Kimai"