mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-04-27 12:25:05 +02:00
4963385bf9
The update was failing with 'mv: cannot stat /opt/2fauth-backup/.env:
No such file or directory' on a system where a previous run had left
/opt/2fauth-backup behind. mv would then nest /opt/2fauth inside the
existing backup directory (as /opt/2fauth-backup/2fauth/), so the
restore step looked at the wrong path.
After fixing that, the app returned a 500 ('Key path
file:///opt/2fauth/storage/oauth-public.key does not exist or is not
readable') because chown/chmod ran before composer install and
php artisan 2fauth:install, leaving vendor/, bootstrap/cache/* and
the regenerated oauth keys owned by root and unreadable by www-data.
- Remove any stale /opt/2fauth-backup before creating the backup, and
remove it again at the end so the next run starts clean
- Use cp instead of mv when restoring .env/storage so the backup is
preserved until the update completes
- Move chown/chmod to AFTER composer + artisan, matching the order in
install/2fauth-install.sh
- Restart php8.4-fpm in addition to nginx so opcache picks up the new
cached config
- Drop redundant quotes around literal paths to match the rest of the
codebase
74 lines
2.1 KiB
Bash
74 lines
2.1 KiB
Bash
#!/usr/bin/env bash
|
|
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
|
|
# 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
|
|
|
|
APP="2FAuth"
|
|
var_tags="${var_tags:-2fa;authenticator}"
|
|
var_cpu="${var_cpu:-1}"
|
|
var_ram="${var_ram:-512}"
|
|
var_disk="${var_disk:-2}"
|
|
var_os="${var_os:-debian}"
|
|
var_version="${var_version:-13}"
|
|
var_unprivileged="${var_unprivileged:-1}"
|
|
|
|
header_info "$APP"
|
|
variables
|
|
color
|
|
catch_errors
|
|
|
|
function update_script() {
|
|
header_info
|
|
check_container_storage
|
|
check_container_resources
|
|
|
|
if [[ ! -d /opt/2fauth ]]; then
|
|
msg_error "No ${APP} Installation Found!"
|
|
exit
|
|
fi
|
|
setup_mariadb
|
|
if check_for_gh_release "2fauth" "Bubka/2FAuth"; then
|
|
$STD apt update
|
|
$STD apt -y upgrade
|
|
|
|
msg_info "Creating Backup"
|
|
rm -rf /opt/2fauth-backup
|
|
mv /opt/2fauth /opt/2fauth-backup
|
|
if ! dpkg -l | grep -q 'php8.4'; then
|
|
cp /etc/nginx/conf.d/2fauth.conf /etc/nginx/conf.d/2fauth.conf.bak
|
|
fi
|
|
msg_ok "Backup Created"
|
|
|
|
if ! dpkg -l | grep -q 'php8.4'; then
|
|
PHP_VERSION="8.4" PHP_FPM="YES" setup_php
|
|
sed -i 's/php8\.[0-9]/php8.4/g' /etc/nginx/conf.d/2fauth.conf
|
|
fi
|
|
fetch_and_deploy_gh_release "2fauth" "Bubka/2FAuth" "tarball"
|
|
setup_composer
|
|
cp /opt/2fauth-backup/.env /opt/2fauth/.env
|
|
cp -r /opt/2fauth-backup/storage /opt/2fauth/storage
|
|
cd /opt/2fauth || return
|
|
export COMPOSER_ALLOW_SUPERUSER=1
|
|
$STD composer install --no-dev --prefer-dist
|
|
php artisan 2fauth:install
|
|
chown -R www-data: /opt/2fauth
|
|
chmod -R 755 /opt/2fauth
|
|
$STD systemctl restart php8.4-fpm
|
|
$STD systemctl restart nginx
|
|
rm -rf /opt/2fauth-backup
|
|
msg_ok "Updated successfully!"
|
|
fi
|
|
exit
|
|
}
|
|
|
|
start
|
|
build_container
|
|
description
|
|
|
|
msg_ok "Completed successfully!\n"
|
|
echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
|
|
echo -e "${INFO}${YW} Access it using the following URL:${CL}"
|
|
echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:80${CL}"
|