mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-07-15 18:35:07 +02:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 35eca66485 |
@@ -60,7 +60,6 @@ function update_script() {
|
|||||||
php artisan 2fauth:install
|
php artisan 2fauth:install
|
||||||
chown -R www-data: /opt/2fauth
|
chown -R www-data: /opt/2fauth
|
||||||
chmod -R 755 /opt/2fauth
|
chmod -R 755 /opt/2fauth
|
||||||
$STD php artisan 2fauth:fix-passport-key-permissions
|
|
||||||
$STD systemctl restart php8.4-fpm
|
$STD systemctl restart php8.4-fpm
|
||||||
$STD systemctl restart nginx
|
$STD systemctl restart nginx
|
||||||
msg_ok "Configured 2FAuth"
|
msg_ok "Configured 2FAuth"
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ $STD php artisan migrate:refresh
|
|||||||
$STD php artisan passport:install -q -n
|
$STD php artisan passport:install -q -n
|
||||||
$STD php artisan storage:link
|
$STD php artisan storage:link
|
||||||
$STD php artisan config:cache
|
$STD php artisan config:cache
|
||||||
$STD php artisan 2fauth:fix-passport-key-permissions
|
|
||||||
chown -R www-data: /opt/2fauth
|
chown -R www-data: /opt/2fauth
|
||||||
chmod -R 755 /opt/2fauth
|
chmod -R 755 /opt/2fauth
|
||||||
msg_ok "Setup 2fauth"
|
msg_ok "Setup 2fauth"
|
||||||
|
|||||||
+7
-7
@@ -4663,20 +4663,20 @@ setup_composer() {
|
|||||||
# - Cleans up legacy repository files
|
# - Cleans up legacy repository files
|
||||||
#
|
#
|
||||||
# Usage:
|
# Usage:
|
||||||
# setup_docker # Uses distro package (recommended)
|
# setup_docker # Uses official Docker repo (recommended)
|
||||||
# USE_DOCKER_REPO=true setup_docker # Uses official Docker repo
|
# USE_DOCKER_REPO=false setup_docker # Uses distro docker.io package
|
||||||
# DOCKER_PORTAINER="true" setup_docker
|
# DOCKER_PORTAINER="true" setup_docker
|
||||||
# DOCKER_LOG_DRIVER="json-file" setup_docker
|
# DOCKER_LOG_DRIVER="json-file" setup_docker
|
||||||
#
|
#
|
||||||
# Variables:
|
# Variables:
|
||||||
# USE_DOCKER_REPO - Set to "true" to use official Docker repository
|
# USE_DOCKER_REPO - Set to "false" to use distro docker.io package
|
||||||
# (default: false, uses distro docker.io package)
|
# (default: true, uses official Docker repository)
|
||||||
# DOCKER_PORTAINER - Install Portainer CE (optional, "true" to enable)
|
# DOCKER_PORTAINER - Install Portainer CE (optional, "true" to enable)
|
||||||
# DOCKER_LOG_DRIVER - Log driver (optional, default: "journald")
|
# DOCKER_LOG_DRIVER - Log driver (optional, default: "journald")
|
||||||
# DOCKER_SKIP_UPDATES - Skip container update check (optional, "true" to skip)
|
# DOCKER_SKIP_UPDATES - Skip container update check (optional, "true" to skip)
|
||||||
#
|
#
|
||||||
# Features:
|
# Features:
|
||||||
# - Uses stable distro packages by default
|
# - Uses official Docker repository by default
|
||||||
# - Migrates from get.docker.com to repository-based installation
|
# - Migrates from get.docker.com to repository-based installation
|
||||||
# - Updates Docker Engine if newer version available
|
# - Updates Docker Engine if newer version available
|
||||||
# - Interactive per-container update prompt (Y/N, 60 s auto-no)
|
# - Interactive per-container update prompt (Y/N, 60 s auto-no)
|
||||||
@@ -4692,7 +4692,7 @@ _docker_is_noninteractive() {
|
|||||||
setup_docker() {
|
setup_docker() {
|
||||||
local docker_installed=false
|
local docker_installed=false
|
||||||
local portainer_installed=false
|
local portainer_installed=false
|
||||||
local USE_DOCKER_REPO="${USE_DOCKER_REPO:-false}"
|
local USE_DOCKER_REPO="${USE_DOCKER_REPO:-true}"
|
||||||
|
|
||||||
# Check if Docker is already installed
|
# Check if Docker is already installed
|
||||||
if command -v docker &>/dev/null; then
|
if command -v docker &>/dev/null; then
|
||||||
@@ -4707,7 +4707,7 @@ setup_docker() {
|
|||||||
msg_info "Portainer container detected"
|
msg_info "Portainer container detected"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Scenario 1: Use distro repository (default, most stable)
|
# Scenario 1: Use distro repository (opt-out via USE_DOCKER_REPO=false)
|
||||||
if [[ "$USE_DOCKER_REPO" != "true" && "$USE_DOCKER_REPO" != "TRUE" && "$USE_DOCKER_REPO" != "1" ]]; then
|
if [[ "$USE_DOCKER_REPO" != "true" && "$USE_DOCKER_REPO" != "TRUE" && "$USE_DOCKER_REPO" != "1" ]]; then
|
||||||
|
|
||||||
# Install or upgrade Docker from distro repo
|
# Install or upgrade Docker from distro repo
|
||||||
|
|||||||
Reference in New Issue
Block a user