Compare commits

..

2 Commits

Author SHA1 Message Date
CanbiZ (MickLesk) 2f6a425631 Add command to fix passport key permissions 2026-07-15 10:18:32 +02:00
CanbiZ (MickLesk) 5fdc8a0d67 2fauth: minor fixes for 8.0.0
Add command to fix passport key permissions
2026-07-15 10:17:26 +02:00
3 changed files with 9 additions and 7 deletions
+1
View File
@@ -60,6 +60,7 @@ function update_script() {
php artisan 2fauth:install
chown -R www-data: /opt/2fauth
chmod -R 755 /opt/2fauth
$STD php artisan 2fauth:fix-passport-key-permissions
$STD systemctl restart php8.4-fpm
$STD systemctl restart nginx
msg_ok "Configured 2FAuth"
+1
View File
@@ -43,6 +43,7 @@ $STD php artisan migrate:refresh
$STD php artisan passport:install -q -n
$STD php artisan storage:link
$STD php artisan config:cache
$STD php artisan 2fauth:fix-passport-key-permissions
chown -R www-data: /opt/2fauth
chmod -R 755 /opt/2fauth
msg_ok "Setup 2fauth"
+7 -7
View File
@@ -4663,20 +4663,20 @@ setup_composer() {
# - Cleans up legacy repository files
#
# Usage:
# setup_docker # Uses official Docker repo (recommended)
# USE_DOCKER_REPO=false setup_docker # Uses distro docker.io package
# setup_docker # Uses distro package (recommended)
# USE_DOCKER_REPO=true setup_docker # Uses official Docker repo
# DOCKER_PORTAINER="true" setup_docker
# DOCKER_LOG_DRIVER="json-file" setup_docker
#
# Variables:
# USE_DOCKER_REPO - Set to "false" to use distro docker.io package
# (default: true, uses official Docker repository)
# USE_DOCKER_REPO - Set to "true" to use official Docker repository
# (default: false, uses distro docker.io package)
# DOCKER_PORTAINER - Install Portainer CE (optional, "true" to enable)
# DOCKER_LOG_DRIVER - Log driver (optional, default: "journald")
# DOCKER_SKIP_UPDATES - Skip container update check (optional, "true" to skip)
#
# Features:
# - Uses official Docker repository by default
# - Uses stable distro packages by default
# - Migrates from get.docker.com to repository-based installation
# - Updates Docker Engine if newer version available
# - Interactive per-container update prompt (Y/N, 60 s auto-no)
@@ -4692,7 +4692,7 @@ _docker_is_noninteractive() {
setup_docker() {
local docker_installed=false
local portainer_installed=false
local USE_DOCKER_REPO="${USE_DOCKER_REPO:-true}"
local USE_DOCKER_REPO="${USE_DOCKER_REPO:-false}"
# Check if Docker is already installed
if command -v docker &>/dev/null; then
@@ -4707,7 +4707,7 @@ setup_docker() {
msg_info "Portainer container detected"
fi
# Scenario 1: Use distro repository (opt-out via USE_DOCKER_REPO=false)
# Scenario 1: Use distro repository (default, most stable)
if [[ "$USE_DOCKER_REPO" != "true" && "$USE_DOCKER_REPO" != "TRUE" && "$USE_DOCKER_REPO" != "1" ]]; then
# Install or upgrade Docker from distro repo