Compare commits

..

2 Commits

Author SHA1 Message Date
e1825a25e6 Update 2fauth-install.sh 2025-12-16 10:09:43 +01:00
a379c663d9 fix(2fauth): use default PHP version instead of hardcoded 8.3
- Remove hardcoded PHP_VERSION=8.3, let setup_php use default (8.4)
- Remove invalid modules 'session' and 'openssl' (part of php-common)
- Remove duplicate 'cli' module (already in DEFAULT_MODULES)
- Make nginx fastcgi_pass use dynamic PHP_VERSION variable

Fixes installation on Debian 13 (Trixie) which ships PHP 8.4.
2025-12-16 10:06:06 +01:00
2 changed files with 15 additions and 20 deletions

View File

@ -17,7 +17,7 @@ msg_info "Installing Dependencies"
$STD apt install -y nginx $STD apt install -y nginx
msg_ok "Installed Dependencies" msg_ok "Installed Dependencies"
PHP_VERSION="8.3" PHP_MODULE="common,ctype,fileinfo,mysql,cli,tokenizer,dom,redis,session,openssl" PHP_FPM="YES" setup_php PHP_MODULE="common,ctype,fileinfo,mysql,tokenizer,dom,redis" PHP_VERSION="8.4" PHP_FPM="YES" setup_php
setup_composer setup_composer
setup_mariadb setup_mariadb
MARIADB_DB_NAME="2fauth_db" MARIADB_DB_USER="2fauth" setup_mariadb_db MARIADB_DB_NAME="2fauth_db" MARIADB_DB_USER="2fauth" setup_mariadb_db
@ -65,7 +65,7 @@ server {
error_page 404 /index.php; error_page 404 /index.php;
location ~ \.php\$ { location ~ \.php\$ {
fastcgi_pass unix:/var/run/php/php8.3-fpm.sock; fastcgi_pass unix:/var/run/php/php${PHP_VERSION}-fpm.sock;
fastcgi_param SCRIPT_FILENAME \$realpath_root\$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME \$realpath_root\$fastcgi_script_name;
include fastcgi_params; include fastcgi_params;
} }

View File

@ -13,11 +13,6 @@ setting_up_container
network_check network_check
update_os update_os
msg_info "Installing Dependencies"
$STD apt install -y rsyslog
systemctl enable -q --now rsyslog
msg_ok "Installed Dependencies"
msg_info "Installing Proxmox Datacenter Manager" msg_info "Installing Proxmox Datacenter Manager"
curl -fsSL https://enterprise.proxmox.com/debian/proxmox-archive-keyring-trixie.gpg -o /usr/share/keyrings/proxmox-archive-keyring.gpg curl -fsSL https://enterprise.proxmox.com/debian/proxmox-archive-keyring-trixie.gpg -o /usr/share/keyrings/proxmox-archive-keyring.gpg
setup_deb822_repo \ setup_deb822_repo \
@ -26,21 +21,21 @@ setup_deb822_repo \
"http://download.proxmox.com/debian/pdm" \ "http://download.proxmox.com/debian/pdm" \
"trixie" \ "trixie" \
"pdm-no-subscription" "pdm-no-subscription"
setup_deb822_repo \ cat <<EOF >/etc/apt/sources.list.d/pdm-test.sources
"pdm-test" \ Types: deb
"https://enterprise.proxmox.com/debian/proxmox-archive-keyring-trixie.gpg" \ URIs: http://download.proxmox.com/debian/pdm
"http://download.proxmox.com/debian/pdm" \ Suites: trixie
"trixie" \ Components: pdm-test
"pdm-test" \ Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
"" \ Enabled: false
"false" EOF
$STD apt update
DEBIAN_FRONTEND=noninteractive DEBIAN_FRONTEND=noninteractive
$STD apt -o Dpkg::Options::="--force-confdef" \ $STD apt -o Dpkg::Options::="--force-confdef" \
-o Dpkg::Options::="--force-confold" \ -o Dpkg::Options::="--force-confold" \
install -y proxmox-datacenter-manager \ install -y proxmox-datacenter-manager \
proxmox-datacenter-manager-ui proxmox-datacenter-manager-ui
msg_ok "Installed Proxmox Datacenter Manager" msg_ok "Installed Proxmox Datacenter Manager"
motd_ssh motd_ssh