From 9fb1b692d187ce93947e931ca65a87ed95c89a91 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 10 Nov 2025 18:55:56 +0100
Subject: [PATCH] Refactor: phpIPAM (#9027)

---
 ct/phpipam.sh              | 15 ++++++++-----
 install/phpipam-install.sh | 45 ++++++++++++--------------------------
 2 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/ct/phpipam.sh b/ct/phpipam.sh
index a639e32e2..1e738a2f5 100644
--- a/ct/phpipam.sh
+++ b/ct/phpipam.sh
@@ -33,17 +33,22 @@ function update_script() {
     systemctl stop apache2
     msg_ok "Stopped Service"
 
+    PHP_VERSION="8.4" PHP_APACHE="YES" PHP_FPM="YES" PHP_MODULE="mysql,gmp,snmp,ldap,apcu" setup_php
+
+    msg_info "Installing PHP-PEAR"
+    $STD apt install -y \
+      php-pear \
+      php-dev
+    msg_ok "Installed PHP-PEAR"
+
     mv /opt/phpipam/ /opt/phpipam-backup
-    fetch_and_deploy_gh_release "phpipam" "phpipam/phpipam" "prebuild" "latest" "/opt/phpipam" "phpipam-v*.zip"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "phpipam" "phpipam/phpipam" "prebuild" "latest" "/opt/phpipam" "phpipam-v*.zip"
     cp /opt/phpipam-backup/config.php /opt/phpipam
+    rm -r /opt/phpipam-backup
 
     msg_info "Starting Service"
     systemctl start apache2
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -r /opt/phpipam-backup
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit
diff --git a/install/phpipam-install.sh b/install/phpipam-install.sh
index 9bc53adf5..4438ce66e 100644
--- a/install/phpipam-install.sh
+++ b/install/phpipam-install.sh
@@ -13,39 +13,27 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt install -y php-pear
-msg_ok "Installed Dependencies"
+PHP_VERSION="8.4" PHP_APACHE="YES" PHP_FPM="YES" PHP_MODULE="mysql,gmp,snmp,ldap,apcu" setup_php
+
+msg_info "Installing PHP-PEAR"
+$STD apt install -y \
+  php-pear \
+  php-dev
+msg_ok "Installed PHP-PEAR"
 
-PHP_VERSION="8.2" PHP_APACHE="YES" PHP_FPM="YES" PHP_MODULE="mysql,imap,apcu,pspell,tidy,xmlrpc,gmp,ldap,common,snmp" setup_php
 setup_mariadb
-
-msg_info "Setting up MariaDB"
-DB_NAME=phpipam
-DB_USER=phpipam
-DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-$STD mariadb -u root -e "CREATE DATABASE $DB_NAME;"
-$STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
-$STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
-{
-  echo "phpIPAM-Credentials"
-  echo "phpIPAM Database User: $DB_USER"
-  echo "phpIPAM Database Password: $DB_PASS"
-  echo "phpIPAM Database Name: $DB_NAME"
-} >>~/phpipam.creds
-msg_ok "Set up MariaDB"
-
+MARIADB_DB_NAME="phpipam" MARIADB_DB_USER="phpipam" setup_mariadb_db
 fetch_and_deploy_gh_release "phpipam" "phpipam/phpipam" "prebuild" "latest" "/opt/phpipam" "phpipam-v*.zip"
 
 msg_info "Installing phpIPAM"
-$STD mariadb -u root "${DB_NAME}" </opt/phpipam/db/SCHEMA.sql
+$STD mariadb -u root "${MARIADB_DB_NAME}" </opt/phpipam/db/SCHEMA.sql
 cp /opt/phpipam/config.dist.php /opt/phpipam/config.php
 sed -i -e "s/\(\$disable_installer = \).*/\1true;/" \
-  -e "s/\(\$db\['user'\] = \).*/\1'$DB_USER';/" \
-  -e "s/\(\$db\['pass'\] = \).*/\1'$DB_PASS';/" \
-  -e "s/\(\$db\['name'\] = \).*/\1'$DB_NAME';/" \
+  -e "s/\(\$db\['user'\] = \).*/\1'$MARIADB_DB_USER';/" \
+  -e "s/\(\$db\['pass'\] = \).*/\1'$MARIADB_DB_PASS';/" \
+  -e "s/\(\$db\['name'\] = \).*/\1'$MARIADB_DB_NAME';/" \
   /opt/phpipam/config.php
-sed -i '/max_execution_time/s/= .*/= 600/' /etc/php/8.2/apache2/php.ini
+sed -i '/max_execution_time/s/= .*/= 600/' /etc/php/8.4/apache2/php.ini
 msg_ok "Installed phpIPAM"
 
 msg_info "Creating Service"
@@ -71,9 +59,4 @@ msg_ok "Created Service"
 
 motd_ssh
 customize
-
-msg_info "Cleaning up"
-$STD apt -y autoremove
-$STD apt -y autoclean
-$STD apt -y clean
-msg_ok "Cleaned"
+cleanup_lxc