From e69d7745794132b5c00b8e55d1d4c3b6d09bbeba Mon Sep 17 00:00:00 2001
From: Bas van den Berg <74251551+bvdberg01@users.noreply.github.com>
Date: Sun, 25 May 2025 19:02:03 +0200
Subject: [PATCH] barassistant update

---
 ct/bar-assistant.sh              |  4 ++--
 install/bar-assistant-install.sh | 18 ++++--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/ct/bar-assistant.sh b/ct/bar-assistant.sh
index 0ae6829..06495eb 100644
--- a/ct/bar-assistant.sh
+++ b/ct/bar-assistant.sh
@@ -12,8 +12,8 @@ var_tags="${var_tags:-inventory;drinks}"
 var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-2048}"
 var_disk="${var_disk:-4}"
-var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_os="${var_os:-ubuntu}"
+var_version="${var_version:-2404}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
diff --git a/install/bar-assistant-install.sh b/install/bar-assistant-install.sh
index cbb9f53..177c46e 100644
--- a/install/bar-assistant-install.sh
+++ b/install/bar-assistant-install.sh
@@ -22,25 +22,15 @@ $STD apt-get install -y \
   npm \
   nginx \
   lsb-release \
-  libvips
+  libvips \
+  php-{ffi,opcache,redis,zip,pdo-sqlite,bcmath,pdo,curl,dom,fpm}
 msg_ok "Installed Dependencies"
 
-msg_info "Adding 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 "Added PHP8.4 Repository"
-
-msg_info "Installing / configuring PHP"
-$STD apt-get remove -y php8.2*
-$STD apt-get install -y \
-  php8.4 \
-  php8.4-{ffi,opcache,redis,zip,pdo-sqlite,bcmath,pdo,curl,dom,fpm}
+msg_info "Configuring PHP"
 PHPVER=$(php -r 'echo PHP_MAJOR_VERSION . "." . PHP_MINOR_VERSION . "\n";')
 sed -i.bak -E 's/^\s*;?\s*ffi\.enable\s*=.*/ffi.enable=true/' /etc/php/${PHPVER}/fpm/php.ini
 $STD systemctl reload php${PHPVER}-fpm
-msg_info "Installed  / configured PHP"
+msg_info "configured PHP"
 
 msg_info "Installing MeiliSearch"
 cd /opt