mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-03-02 17:05:55 +01:00
dbdd891a99
* fix(error-handler): prevent silent() from re-enabling error handling during recovery Root cause: silent() (core.func) unconditionally calls set -Eeuo pipefail and trap 'error_handler' ERR after every command. When build_container() intentionally disables error handling for its recovery section, any intermediate call through silent()/ re-enables it. This causes the grep/sed pipeline for missing_cmd extraction to trigger error_handler (grep returns exit code 1 on no match + pipefail = fatal). Fixes: 1. silent(): Save errexit state before disabling, only restore if it was active. Callers that intentionally disabled error handling (e.g. build_container recovery) are no longer silently re-enabled. 2. build.func: Add || true to missing_cmd grep pipeline as defense-in-depth against pipeline failure propagation. 3. build.func: Add explicit set +Eeuo pipefail / trap - ERR after post_update_to_api() call, before error classification grep/sed section. 4. build.func: Remove stale global combined_log variable from variables() that used a different path format (/tmp/install-SESSION-combined.log) than the actual local variable (/tmp/NSAPP-CTID-SESSION.log). The global was never written to and caused confusion when error_handler displayed it. * Update build.func * chore(install): add Github source links to all setup_nodejs scripts 52 install scripts had a project website in '# Source:' but no GitHub link. Merged the GitHub repo URL into the Source header as: # Source: https://website.com/ | Github: https://github.com/OWNER/REPO Repos sourced from fetch_and_deploy_gh_release calls, get_latest_github_release calls, or known project repos for npm/pip installed apps. Two scripts (fumadocs, pve-scripts-local) had no Source line at all — added one. Shinobi skipped (GitLab-only, no GitHub repo). * chore(install): add Github source links to all fetch_and_deploy scripts 77 additional install scripts had fetch_and_deploy_gh_release calls but no GitHub link in the Source header. Merged the primary app repo into the Source header as: # Source: https://website.com/ | Github: https://github.com/OWNER/REPO Where multiple fetch_and_deploy calls existed (app + dependency), the primary app repo was selected: - ersatztv: ErsatzTV/ErsatzTV (not ffmpeg) - firefly: firefly-iii/firefly-iii (not data-importer) - komga: gotson/komga (not kepubify dep) - sabnzbd: sabnzbd/sabnzbd (not par2cmdline-turbo dep) - signoz: SigNoz/signoz (not otel-collector) - tunarr: chrisbenincasa/tunarr (not ffmpeg dep) Also fixed cosmos-install.sh double https:// in Source URL. Skipped: autocaliweb (source already on codeberg, GitHub repos are deps only) * revert: restore misc/build.func and misc/core.func to main state These error-handler fixes belong to fix/error-handler-recovery, not to this sources-only branch. * chore(ct,tools): sync Source headers with install/ and add Github links to addon scripts
85 lines
2.3 KiB
Bash
85 lines
2.3 KiB
Bash
#!/usr/bin/env bash
|
|
|
|
# Copyright (c) 2021-2026 community-scripts ORG
|
|
# Author: jkrgr0
|
|
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
|
# Source: https://docs.2fauth.app/ | Github: https://github.com/Bubka/2FAuth
|
|
|
|
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
|
|
color
|
|
verb_ip6
|
|
catch_errors
|
|
setting_up_container
|
|
network_check
|
|
update_os
|
|
|
|
msg_info "Installing Dependencies"
|
|
$STD apt install -y nginx
|
|
msg_ok "Installed Dependencies"
|
|
|
|
export PHP_VERSION="8.4"
|
|
PHP_FPM="YES" setup_php
|
|
setup_composer
|
|
setup_mariadb
|
|
MARIADB_DB_NAME="2fauth_db" MARIADB_DB_USER="2fauth" setup_mariadb_db
|
|
|
|
fetch_and_deploy_gh_release "2fauth" "Bubka/2FAuth" "tarball"
|
|
|
|
msg_info "Setup 2FAuth"
|
|
cd /opt/2fauth
|
|
cp .env.example .env
|
|
sed -i -e "s|^APP_URL=.*|APP_URL=http://$LOCAL_IP|" \
|
|
-e "s|^DB_CONNECTION=$|DB_CONNECTION=mysql|" \
|
|
-e "s|^DB_DATABASE=$|DB_DATABASE=$MARIADB_DB_NAME|" \
|
|
-e "s|^DB_HOST=$|DB_HOST=127.0.0.1|" \
|
|
-e "s|^DB_PORT=$|DB_PORT=3306|" \
|
|
-e "s|^DB_USERNAME=$|DB_USERNAME=$MARIADB_DB_USER|" \
|
|
-e "s|^DB_PASSWORD=$|DB_PASSWORD=$MARIADB_DB_PASS|" .env
|
|
export COMPOSER_ALLOW_SUPERUSER=1
|
|
$STD composer update --no-plugins --no-scripts
|
|
$STD composer install --no-dev --prefer-dist --no-plugins --no-scripts
|
|
$STD php artisan key:generate --force
|
|
$STD php artisan migrate:refresh
|
|
$STD php artisan passport:install -q -n
|
|
$STD php artisan storage:link
|
|
$STD php artisan config:cache
|
|
chown -R www-data: /opt/2fauth
|
|
chmod -R 755 /opt/2fauth
|
|
msg_ok "Setup 2fauth"
|
|
|
|
msg_info "Configure Service"
|
|
cat <<EOF >/etc/nginx/conf.d/2fauth.conf
|
|
server {
|
|
listen 80;
|
|
root /opt/2fauth/public;
|
|
server_name $LOCAL_IP;
|
|
index index.php;
|
|
charset utf-8;
|
|
|
|
location / {
|
|
try_files \$uri \$uri/ /index.php?\$query_string;
|
|
}
|
|
|
|
location = /favicon.ico { access_log off; log_not_found off; }
|
|
location = /robots.txt { access_log off; log_not_found off; }
|
|
|
|
error_page 404 /index.php;
|
|
|
|
location ~ \.php\$ {
|
|
fastcgi_pass unix:/var/run/php/php${PHP_VERSION}-fpm.sock;
|
|
fastcgi_param SCRIPT_FILENAME \$realpath_root\$fastcgi_script_name;
|
|
include fastcgi_params;
|
|
}
|
|
|
|
location ~ /\.(?!well-known).* {
|
|
deny all;
|
|
}
|
|
}
|
|
EOF
|
|
systemctl reload nginx
|
|
msg_ok "Configured Service"
|
|
|
|
motd_ssh
|
|
customize
|
|
cleanup_lxc
|