mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2025-12-16 20:23:32 +01:00
Compare commits
13 Commits
fix/pdm-sy
...
pr-update-
| Author | SHA1 | Date | |
|---|---|---|---|
| b923af7add | |||
| 4b09cb3d00 | |||
| 01b147d28a | |||
| e95ae11f88 | |||
| f2a2ec30ba | |||
| 798015df6f | |||
| 2773faee08 | |||
| b524cbe232 | |||
| 7b55077a00 | |||
| 7ab0327376 | |||
| 51ba8ca7c8 | |||
| 6d78e4da6b | |||
| a3fb28105d |
15
CHANGELOG.md
15
CHANGELOG.md
@ -12,6 +12,21 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
|||||||
|
|
||||||
## 2025-12-16
|
## 2025-12-16
|
||||||
|
|
||||||
|
### 🚀 Updated Scripts
|
||||||
|
|
||||||
|
- #### 🐞 Bug Fixes
|
||||||
|
|
||||||
|
- Miniflux: use correct systemctl to check service instead of file path [@MickLesk](https://github.com/MickLesk) ([#10024](https://github.com/community-scripts/ProxmoxVE/pull/10024))
|
||||||
|
- 2fauth: bump to php8.4 [@MickLesk](https://github.com/MickLesk) ([#10019](https://github.com/community-scripts/ProxmoxVE/pull/10019))
|
||||||
|
- PhotoPrism: export env variables for CLI tools [@MickLesk](https://github.com/MickLesk) ([#10023](https://github.com/community-scripts/ProxmoxVE/pull/10023))
|
||||||
|
|
||||||
|
### 💾 Core
|
||||||
|
|
||||||
|
- #### ✨ New Features
|
||||||
|
|
||||||
|
- tools.func: add optional enabled parameter to setup_deb822_repo [@MickLesk](https://github.com/MickLesk) ([#10017](https://github.com/community-scripts/ProxmoxVE/pull/10017))
|
||||||
|
- core: map Etc/* timezones to 'host' for pct compatibility [@MickLesk](https://github.com/MickLesk) ([#10020](https://github.com/community-scripts/ProxmoxVE/pull/10020))
|
||||||
|
|
||||||
## 2025-12-15
|
## 2025-12-15
|
||||||
|
|
||||||
### 🆕 New Scripts
|
### 🆕 New Scripts
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
_ __ __ _ ___
|
_____
|
||||||
/ | / /__ / /| | / (_)________ _____
|
/ ___/_________ _____ ____ ____ __ __
|
||||||
/ |/ / _ \/ __/ | / / / ___/ __ \/ ___/
|
\__ \/ ___/ __ `/ __ \/ __ \/ __ \/ / / /
|
||||||
/ /| / __/ /_ | |/ / (__ ) /_/ / /
|
___/ / /__/ /_/ / / / / /_/ / /_/ / /_/ /
|
||||||
/_/ |_/\___/\__/ |___/_/____/\____/_/
|
/____/\___/\__,_/_/ /_/\____/ .___/\__, /
|
||||||
|
/_/ /____/
|
||||||
|
|||||||
6
ct/headers/scanopy
Normal file
6
ct/headers/scanopy
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
_____
|
||||||
|
/ ___/_________ _____ ____ ____ __ __
|
||||||
|
\__ \/ ___/ __ `/ __ \/ __ \/ __ \/ / / /
|
||||||
|
___/ / /__/ /_/ / / / / /_/ / /_/ / /_/ /
|
||||||
|
/____/\___/\__,_/_/ /_/\____/ .___/\__, /
|
||||||
|
/_/ /____/
|
||||||
@ -23,7 +23,7 @@ function update_script() {
|
|||||||
header_info
|
header_info
|
||||||
check_container_storage
|
check_container_storage
|
||||||
check_container_resources
|
check_container_resources
|
||||||
if [[ ! -f /etc/systemd/system/miniflux.service ]]; then
|
if ! systemctl -q is-enabled miniflux 2>/dev/null; then
|
||||||
msg_error "No ${APP} Installation Found!"
|
msg_error "No ${APP} Installation Found!"
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|||||||
131
ct/netvisor.sh
131
ct/netvisor.sh
@ -3,9 +3,9 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV
|
|||||||
# Copyright (c) 2021-2025 community-scripts ORG
|
# Copyright (c) 2021-2025 community-scripts ORG
|
||||||
# Author: vhsdream
|
# Author: vhsdream
|
||||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||||
# Source: https://github.com/netvisor-io/netvisor
|
# Source: https://github.com/scanopy/scanopy
|
||||||
|
|
||||||
APP="NetVisor"
|
APP="Scanopy"
|
||||||
var_tags="${var_tags:-analytics}"
|
var_tags="${var_tags:-analytics}"
|
||||||
var_cpu="${var_cpu:-2}"
|
var_cpu="${var_cpu:-2}"
|
||||||
var_ram="${var_ram:-3072}"
|
var_ram="${var_ram:-3072}"
|
||||||
@ -29,71 +29,74 @@ function update_script() {
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if check_for_gh_release "netvisor" "netvisor-io/netvisor"; then
|
msg_info "Stopping services"
|
||||||
msg_info "Stopping services"
|
systemctl -q disable --now netvisor-daemon netvisor-server
|
||||||
systemctl stop netvisor-daemon netvisor-server
|
msg_ok "Stopped services"
|
||||||
msg_ok "Stopped services"
|
|
||||||
|
|
||||||
msg_info "Backing up configurations"
|
NODE_VERSION="24" setup_nodejs
|
||||||
cp /opt/netvisor/.env /opt/netvisor.env.bak
|
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "scanopy" "scanopy/scanopy" "tarball" "latest" "/opt/scanopy"
|
||||||
if [[ -f /opt/netvisor/oidc.toml ]]; then
|
|
||||||
cp /opt/netvisor/oidc.toml /opt/netvisor.oidc.toml
|
|
||||||
fi
|
|
||||||
msg_ok "Backed up configurations"
|
|
||||||
|
|
||||||
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "netvisor" "netvisor-io/netvisor" "tarball" "latest" "/opt/netvisor"
|
if ! dpkg -l | grep -q "pkg-config"; then
|
||||||
|
$STD apt install -y pkg-config
|
||||||
if ! dpkg -l | grep -q "pkg-config"; then
|
|
||||||
$STD apt install -y pkg-config
|
|
||||||
fi
|
|
||||||
if ! dpkg -l | grep -q "libssl-dev"; then
|
|
||||||
$STD apt install -y libssl-dev
|
|
||||||
fi
|
|
||||||
TOOLCHAIN="$(grep "channel" /opt/netvisor/backend/rust-toolchain.toml | awk -F\" '{print $2}')"
|
|
||||||
RUST_TOOLCHAIN=$TOOLCHAIN setup_rust
|
|
||||||
|
|
||||||
mv /opt/netvisor.env.bak /opt/netvisor/.env
|
|
||||||
if [[ -f /opt/netvisor.oidc.toml ]]; then
|
|
||||||
mv /opt/netvisor.oidc.toml /opt/netvisor/oidc.toml
|
|
||||||
fi
|
|
||||||
LOCAL_IP="$(hostname -I | awk '{print $1}')"
|
|
||||||
if ! grep -q "PUBLIC_URL" /opt/netvisor/.env; then
|
|
||||||
sed -i "\|_PATH=|a\NETVISOR_PUBLIC_URL=http://${LOCAL_IP}:60072" /opt/netvisor/.env
|
|
||||||
fi
|
|
||||||
sed -i 's|_TARGET=.*$|_URL=http://127.0.0.1:60072|' /opt/netvisor/.env
|
|
||||||
|
|
||||||
msg_info "Creating frontend UI"
|
|
||||||
export PUBLIC_SERVER_HOSTNAME=default
|
|
||||||
export PUBLIC_SERVER_PORT=""
|
|
||||||
cd /opt/netvisor/ui
|
|
||||||
$STD npm ci --no-fund --no-audit
|
|
||||||
$STD npm run build
|
|
||||||
msg_ok "Created frontend UI"
|
|
||||||
|
|
||||||
msg_info "Building Netvisor-server (patience)"
|
|
||||||
cd /opt/netvisor/backend
|
|
||||||
$STD cargo build --release --bin server
|
|
||||||
mv ./target/release/server /usr/bin/netvisor-server
|
|
||||||
msg_ok "Built Netvisor-server"
|
|
||||||
|
|
||||||
msg_info "Building Netvisor-daemon"
|
|
||||||
$STD cargo build --release --bin daemon
|
|
||||||
cp ./target/release/daemon /usr/bin/netvisor-daemon
|
|
||||||
msg_ok "Built Netvisor-daemon"
|
|
||||||
|
|
||||||
sed -i -e 's|-target|-url|' \
|
|
||||||
-e 's| --server-port |:|' \
|
|
||||||
/etc/systemd/system/netvisor-daemon.service
|
|
||||||
sed -i '/^ \"server_target.*$/d' /root/.config/daemon/config.json
|
|
||||||
if ! grep -q "WorkingD" /etc/systemd/system/netvisor-server.service; then
|
|
||||||
sed -i '\|simple$|a\WorkingDirectory=/opt/netvisor/backend' /etc/systemd/system/netvisor-server.service
|
|
||||||
fi
|
|
||||||
systemctl daemon-reload
|
|
||||||
|
|
||||||
msg_info "Starting services"
|
|
||||||
systemctl start netvisor-server netvisor-daemon
|
|
||||||
msg_ok "Updated successfully!"
|
|
||||||
fi
|
fi
|
||||||
|
if ! dpkg -l | grep -q "libssl-dev"; then
|
||||||
|
$STD apt install -y libssl-dev
|
||||||
|
fi
|
||||||
|
TOOLCHAIN="$(grep "channel" /opt/scanopy/backend/rust-toolchain.toml | awk -F\" '{print $2}')"
|
||||||
|
RUST_TOOLCHAIN=$TOOLCHAIN setup_rust
|
||||||
|
|
||||||
|
mv /opt/netvisor/.env /opt/scanopy/.env
|
||||||
|
if [[ -f /opt/netvisor/oidc.toml ]]; then
|
||||||
|
mv /opt/netvisor/oidc.toml /opt/scanopy/oidc.toml
|
||||||
|
fi
|
||||||
|
LOCAL_IP="$(hostname -I | awk '{print $1}')"
|
||||||
|
if ! grep -q "PUBLIC_URL" /opt/scanopy/.env; then
|
||||||
|
sed -i "\|_PATH=|a\NETVISOR_PUBLIC_URL=http://${LOCAL_IP}:60072" /opt/scanopy/.env
|
||||||
|
fi
|
||||||
|
sed -i 's|_TARGET=.*$|_URL=http://127.0.0.1:60072|' /opt/scanopy/.env
|
||||||
|
sed -i 's/NETVISOR/SCANOPY/g; s|netvisor/|scanopy/|' /opt/scanopy/.env
|
||||||
|
|
||||||
|
msg_info "Creating frontend UI"
|
||||||
|
export PUBLIC_SERVER_HOSTNAME=default
|
||||||
|
export PUBLIC_SERVER_PORT=""
|
||||||
|
cd /opt/scanopy/ui
|
||||||
|
$STD npm ci --no-fund --no-audit
|
||||||
|
$STD npm run build
|
||||||
|
msg_ok "Created frontend UI"
|
||||||
|
|
||||||
|
msg_info "Building Scanopy-server (patience)"
|
||||||
|
cd /opt/scanopy/backend
|
||||||
|
$STD cargo build --release --bin server
|
||||||
|
mv ./target/release/server /usr/bin/scanopy-server
|
||||||
|
msg_ok "Built Scanopy-server"
|
||||||
|
|
||||||
|
msg_info "Building Scanopy-daemon"
|
||||||
|
$STD cargo build --release --bin daemon
|
||||||
|
cp ./target/release/daemon /usr/bin/scanopy-daemon
|
||||||
|
msg_ok "Built Scanopy-daemon"
|
||||||
|
|
||||||
|
sed -i '/^ \"server_target.*$/d' /root/.config/daemon/config.json
|
||||||
|
sed -i -e 's|-target|-url|' \
|
||||||
|
-e 's| --server-port |:|' \
|
||||||
|
-e 's/NetVisor/Scanopy/' \
|
||||||
|
-e 's/netvisor/scanopy/' \
|
||||||
|
/etc/systemd/system/netvisor-daemon.service
|
||||||
|
mv /etc/systemd/system/netvisor-daemon.service /etc/systemd/system/scanopy-daemon.service
|
||||||
|
sed -i -e 's/NetVisor/Scanopy/' \
|
||||||
|
-e 's/netvisor/scanopy/g' \
|
||||||
|
/etc/systemd/system/netvisor-server.service
|
||||||
|
mv /etc/systemd/system/netvisor-server.service /etc/systemd/system/scanopy-server.service
|
||||||
|
systemctl daemon-reload
|
||||||
|
|
||||||
|
msg_info "Starting services"
|
||||||
|
systemctl -q enable --now scanopy-server scanopy-daemon
|
||||||
|
msg_ok "Updated successfully!"
|
||||||
|
|
||||||
|
sed -i 's/netvisor/scanopy/' /usr/bin/update
|
||||||
|
mv ~/NetVisor.creds ~/scanopy.creds
|
||||||
|
rm ~/.netvisor
|
||||||
|
rm -rf /opt/netvisor
|
||||||
|
|
||||||
exit
|
exit
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -31,6 +31,13 @@ function update_script() {
|
|||||||
msg_info "Stopping PhotoPrism"
|
msg_info "Stopping PhotoPrism"
|
||||||
systemctl stop photoprism
|
systemctl stop photoprism
|
||||||
msg_ok "Stopped PhotoPrism"
|
msg_ok "Stopped PhotoPrism"
|
||||||
|
|
||||||
|
if ! grep -q "photoprism/config/.env" ~/.bashrc 2>/dev/null; then
|
||||||
|
msg_info "Adding environment export for CLI tools"
|
||||||
|
echo '# Load PhotoPrism environment variables for CLI tools' >>~/.bashrc
|
||||||
|
echo 'export $(grep -v "^#" /opt/photoprism/config/.env | xargs)' >>~/.bashrc
|
||||||
|
msg_ok "Added environment export"
|
||||||
|
fi
|
||||||
|
|
||||||
fetch_and_deploy_gh_release "photoprism" "photoprism/photoprism" "prebuild" "latest" "/opt/photoprism" "*linux-amd64.tar.gz"
|
fetch_and_deploy_gh_release "photoprism" "photoprism/photoprism" "prebuild" "latest" "/opt/photoprism" "*linux-amd64.tar.gz"
|
||||||
|
|
||||||
|
|||||||
99
ct/scanopy.sh
Normal file
99
ct/scanopy.sh
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
|
||||||
|
# Copyright (c) 2021-2025 community-scripts ORG
|
||||||
|
# Author: vhsdream
|
||||||
|
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||||
|
# Source: https://github.com/scanopy/scanopy
|
||||||
|
|
||||||
|
APP="Scanopy"
|
||||||
|
var_tags="${var_tags:-analytics}"
|
||||||
|
var_cpu="${var_cpu:-2}"
|
||||||
|
var_ram="${var_ram:-3072}"
|
||||||
|
var_disk="${var_disk:-6}"
|
||||||
|
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/scanopy ]]; then
|
||||||
|
msg_error "No ${APP} Installation Found!"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
if check_for_gh_release "scanopy" "scanopy-io/scanopy"; then
|
||||||
|
msg_info "Stopping services"
|
||||||
|
systemctl stop scanopy-daemon scanopy-server
|
||||||
|
msg_ok "Stopped services"
|
||||||
|
|
||||||
|
msg_info "Backing up configurations"
|
||||||
|
cp /opt/scanopy/.env /opt/scanopy.env.bak
|
||||||
|
if [[ -f /opt/scanopy/oidc.toml ]]; then
|
||||||
|
cp /opt/scanopy/oidc.toml /opt/scanopy.oidc.toml
|
||||||
|
fi
|
||||||
|
msg_ok "Backed up configurations"
|
||||||
|
|
||||||
|
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "scanopy" "scanopy/scanopy" "tarball" "latest" "/opt/scanopy"
|
||||||
|
|
||||||
|
if ! dpkg -l | grep -q "pkg-config"; then
|
||||||
|
$STD apt install -y pkg-config
|
||||||
|
fi
|
||||||
|
if ! dpkg -l | grep -q "libssl-dev"; then
|
||||||
|
$STD apt install -y libssl-dev
|
||||||
|
fi
|
||||||
|
TOOLCHAIN="$(grep "channel" /opt/scanopy/backend/rust-toolchain.toml | awk -F\" '{print $2}')"
|
||||||
|
RUST_TOOLCHAIN=$TOOLCHAIN setup_rust
|
||||||
|
|
||||||
|
mv /opt/scanopy.env.bak /opt/scanopy/.env
|
||||||
|
if [[ -f /opt/scanopy.oidc.toml ]]; then
|
||||||
|
mv /opt/scanopy.oidc.toml /opt/scanopy/oidc.toml
|
||||||
|
fi
|
||||||
|
LOCAL_IP="$(hostname -I | awk '{print $1}')"
|
||||||
|
if ! grep -q "PUBLIC_URL" /opt/scanopy/.env; then
|
||||||
|
sed -i "\|_PATH=|a\scanopy_PUBLIC_URL=http://${LOCAL_IP}:60072" /opt/scanopy/.env
|
||||||
|
fi
|
||||||
|
sed -i 's|_TARGET=.*$|_URL=http://127.0.0.1:60072|' /opt/scanopy/.env
|
||||||
|
|
||||||
|
msg_info "Creating frontend UI"
|
||||||
|
export PUBLIC_SERVER_HOSTNAME=default
|
||||||
|
export PUBLIC_SERVER_PORT=""
|
||||||
|
cd /opt/scanopy/ui
|
||||||
|
$STD npm ci --no-fund --no-audit
|
||||||
|
$STD npm run build
|
||||||
|
msg_ok "Created frontend UI"
|
||||||
|
|
||||||
|
msg_info "Building scanopy-server (patience)"
|
||||||
|
cd /opt/scanopy/backend
|
||||||
|
$STD cargo build --release --bin server
|
||||||
|
mv ./target/release/server /usr/bin/scanopy-server
|
||||||
|
msg_ok "Built scanopy-server"
|
||||||
|
|
||||||
|
msg_info "Building scanopy-daemon"
|
||||||
|
$STD cargo build --release --bin daemon
|
||||||
|
cp ./target/release/daemon /usr/bin/scanopy-daemon
|
||||||
|
msg_ok "Built scanopy-daemon"
|
||||||
|
|
||||||
|
msg_info "Starting services"
|
||||||
|
systemctl start scanopy-server scanopy-daemon
|
||||||
|
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}:60072${CL}"
|
||||||
|
echo -e "${INFO}${YW} Then create your account, and run the 'configure_daemon.sh' script to setup the daemon.${CL}"
|
||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "NetVisor",
|
"name": "Scanopy",
|
||||||
"slug": "netvisor",
|
"slug": "scanopy",
|
||||||
"categories": [
|
"categories": [
|
||||||
9
|
9
|
||||||
],
|
],
|
||||||
@ -9,15 +9,15 @@
|
|||||||
"updateable": true,
|
"updateable": true,
|
||||||
"privileged": false,
|
"privileged": false,
|
||||||
"interface_port": 60072,
|
"interface_port": 60072,
|
||||||
"documentation": "https://github.com/netvisor-io/netvisor",
|
"documentation": "https://github.com/scanopy/scanopy",
|
||||||
"config_path": "/opt/netvisor/.env, OIDC: /opt/netvisor/oidc.toml",
|
"config_path": "/opt/scanopy/.env, OIDC: /opt/scanopy/oidc.toml",
|
||||||
"website": "https://netvisor.io",
|
"website": "https://scanopy.net",
|
||||||
"logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/png/netvisor.png",
|
"logo": "https://cdn.jsdelivr.net/gh/selfhst/icons@main/webp/scanopy.webp",
|
||||||
"description": "Automatically discover and visually document network infrastructure",
|
"description": "Automatically discover and visually document network infrastructure",
|
||||||
"install_methods": [
|
"install_methods": [
|
||||||
{
|
{
|
||||||
"type": "default",
|
"type": "default",
|
||||||
"script": "ct/netvisor.sh",
|
"script": "ct/scanopy.sh",
|
||||||
"resources": {
|
"resources": {
|
||||||
"cpu": 2,
|
"cpu": 2,
|
||||||
"ram": 3072,
|
"ram": 3072,
|
||||||
@ -17,7 +17,8 @@ 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_VERSION="8.4"
|
||||||
|
PHP_MODULE="common,ctype,fileinfo,mysql,tokenizer,dom,redis" 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 +66,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;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,142 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Copyright (c) 2021-2025 community-scripts ORG
|
|
||||||
# Author: vhsdream
|
|
||||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
|
||||||
# Source: https://github.com/netvisor-io/netvisor
|
|
||||||
|
|
||||||
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 \
|
|
||||||
build-essential \
|
|
||||||
libssl-dev \
|
|
||||||
pkg-config
|
|
||||||
msg_ok "Installed Dependencies"
|
|
||||||
|
|
||||||
PG_VERSION=17 setup_postgresql
|
|
||||||
NODE_VERSION="24" setup_nodejs
|
|
||||||
PG_DB_NAME="netvisor_db" PG_DB_USER="netvisor" PG_DB_GRANT_SUPERUSER="true" setup_postgresql_db
|
|
||||||
|
|
||||||
fetch_and_deploy_gh_release "netvisor" "netvisor-io/netvisor" "tarball" "latest" "/opt/netvisor"
|
|
||||||
|
|
||||||
TOOLCHAIN="$(grep "channel" /opt/netvisor/backend/rust-toolchain.toml | awk -F\" '{print $2}')"
|
|
||||||
RUST_TOOLCHAIN=$TOOLCHAIN setup_rust
|
|
||||||
|
|
||||||
msg_info "Creating frontend UI"
|
|
||||||
export PUBLIC_SERVER_HOSTNAME=default
|
|
||||||
export PUBLIC_SERVER_PORT=""
|
|
||||||
cd /opt/netvisor/ui
|
|
||||||
$STD npm ci --no-fund --no-audit
|
|
||||||
$STD npm run build
|
|
||||||
msg_ok "Created frontend UI"
|
|
||||||
|
|
||||||
msg_info "Building Netvisor-server (patience)"
|
|
||||||
cd /opt/netvisor/backend
|
|
||||||
$STD cargo build --release --bin server
|
|
||||||
mv ./target/release/server /usr/bin/netvisor-server
|
|
||||||
msg_ok "Built Netvisor-server"
|
|
||||||
|
|
||||||
msg_info "Building Netvisor-daemon"
|
|
||||||
$STD cargo build --release --bin daemon
|
|
||||||
cp ./target/release/daemon /usr/bin/netvisor-daemon
|
|
||||||
msg_ok "Built Netvisor-daemon"
|
|
||||||
|
|
||||||
msg_info "Configuring server for first-run"
|
|
||||||
LOCAL_IP="$(hostname -I | awk '{print $1}')"
|
|
||||||
cat <<EOF >/opt/netvisor/.env
|
|
||||||
### - SERVER
|
|
||||||
NETVISOR_DATABASE_URL=postgresql://$PG_DB_USER:$PG_DB_PASS@localhost:5432/$PG_DB_NAME
|
|
||||||
NETVISOR_WEB_EXTERNAL_PATH="/opt/netvisor/ui/build"
|
|
||||||
NETVISOR_PUBLIC_URL=http://${LOCAL_IP}:60072
|
|
||||||
NETVISOR_SERVER_PORT=60072
|
|
||||||
NETVISOR_LOG_LEVEL=info
|
|
||||||
NETVISOR_INTEGRATED_DAEMON_URL=http://127.0.0.1:60073
|
|
||||||
## - uncomment to disable signups
|
|
||||||
# NETVISOR_DISABLE_REGISTRATION=true
|
|
||||||
## - uncomment when using TLS
|
|
||||||
# NETVISOR_USE_SECURE_SESSION_COOKIES=true
|
|
||||||
## - see https://github.com/imbolc/axum-client-ip?tab=readme-ov-file#configurable-vs-specific-extractors
|
|
||||||
## - before uncommenting the below
|
|
||||||
# NETVISOR_CLIENT_IP_SOURCE=
|
|
||||||
|
|
||||||
### - SMTP (password reset and notifications - optional)
|
|
||||||
# NETVISOR_SMTP_RELAY=smtp.gmail.com:587
|
|
||||||
# NETVISOR_SMTP_USERNAME=your-email@gmail.com
|
|
||||||
# NETVISOR_SMTP_PASSWORD=your-app-password
|
|
||||||
# NETVISOR_SMTP_EMAIL=netvisor@yourdomain.tld
|
|
||||||
|
|
||||||
### - INTEGRATED DAEMON
|
|
||||||
NETVISOR_SERVER_URL=http://127.0.0.1:60072
|
|
||||||
NETVISOR_BIND_ADDRESS=0.0.0.0
|
|
||||||
NETVISOR_NAME="netvisor-daemon"
|
|
||||||
NETVISOR_HEARTBEAT_INTERVAL=30
|
|
||||||
|
|
||||||
### - see https://github.com/netvisor-io/netvisor/blob/main/docs/CONFIGURATION.md for more options
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat <<EOF >/etc/systemd/system/netvisor-server.service
|
|
||||||
[Unit]
|
|
||||||
Description=NetVisor Network Discovery Server
|
|
||||||
After=network.target postgresql.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=simple
|
|
||||||
WorkingDirectory=/opt/netvisor/backend
|
|
||||||
EnvironmentFile=/opt/netvisor/.env
|
|
||||||
ExecStart=/usr/bin/netvisor-server
|
|
||||||
Restart=always
|
|
||||||
RestartSec=10
|
|
||||||
StandardOutput=journal
|
|
||||||
StandardError=journal
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
EOF
|
|
||||||
|
|
||||||
systemctl enable -q --now netvisor-server
|
|
||||||
|
|
||||||
# Creating short script to configure netvisor-daemon
|
|
||||||
cat <<EOF >~/configure_daemon.sh
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
echo "Auto-configuring integrated daemon..."
|
|
||||||
|
|
||||||
NETWORK_ID="\$(sudo -u postgres psql -1 -t -d "${PG_DB_NAME}" -c 'SELECT id FROM networks;')"
|
|
||||||
API_KEY="\$(sudo -u postgres psql -1 -t -d "${PG_DB_NAME}" -c 'SELECT key FROM api_keys;')"
|
|
||||||
|
|
||||||
cat <<END >/etc/systemd/system/netvisor-daemon.service
|
|
||||||
[Unit]
|
|
||||||
Description=NetVisor Network Discovery Daemon
|
|
||||||
After=network-online.target
|
|
||||||
Wants=network-online.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=simple
|
|
||||||
User=root
|
|
||||||
ExecStart=/usr/bin/netvisor-daemon --server-url http://127.0.0.1:60072 --network-id \${NETWORK_ID} --daemon-api-key \${API_KEY} --mode push
|
|
||||||
Restart=always
|
|
||||||
RestartSec=10
|
|
||||||
StandardOutput=journal
|
|
||||||
StandardError=journal
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
END
|
|
||||||
|
|
||||||
systemctl enable -q --now netvisor-daemon
|
|
||||||
echo "NetVisor daemon configured and running"
|
|
||||||
|
|
||||||
EOF
|
|
||||||
chmod +x ~/configure_daemon.sh
|
|
||||||
msg_ok "Netvisor server running - please create an account in the UI to continue."
|
|
||||||
|
|
||||||
motd_ssh
|
|
||||||
customize
|
|
||||||
cleanup_lxc
|
|
||||||
@ -28,6 +28,8 @@ $STD apt install -y \
|
|||||||
lsb-release
|
lsb-release
|
||||||
|
|
||||||
echo 'export PATH=/usr/local:$PATH' >>~/.bashrc
|
echo 'export PATH=/usr/local:$PATH' >>~/.bashrc
|
||||||
|
echo '# Load PhotoPrism environment variables for CLI tools' >>~/.bashrc
|
||||||
|
echo 'export $(grep -v "^#" /opt/photoprism/config/.env | xargs)' >>~/.bashrc
|
||||||
export PATH=/usr/local:$PATH
|
export PATH=/usr/local:$PATH
|
||||||
msg_ok "Installed Dependencies"
|
msg_ok "Installed Dependencies"
|
||||||
|
|
||||||
|
|||||||
@ -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
|
||||||
|
|||||||
140
install/scanopy-install.sh
Normal file
140
install/scanopy-install.sh
Normal file
@ -0,0 +1,140 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Copyright (c) 2021-2025 community-scripts ORG
|
||||||
|
# Author: vhsdream
|
||||||
|
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||||
|
# Source: https://github.com/scanopy/scanopy
|
||||||
|
|
||||||
|
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 \
|
||||||
|
build-essential \
|
||||||
|
libssl-dev \
|
||||||
|
pkg-config
|
||||||
|
msg_ok "Installed Dependencies"
|
||||||
|
|
||||||
|
PG_VERSION=17 setup_postgresql
|
||||||
|
NODE_VERSION="24" setup_nodejs
|
||||||
|
PG_DB_NAME="scanopy_db" PG_DB_USER="scanopy" PG_DB_GRANT_SUPERUSER="true" setup_postgresql_db
|
||||||
|
fetch_and_deploy_gh_release "scanopy" "scanopy/scanopy" "tarball" "latest" "/opt/scanopy"
|
||||||
|
TOOLCHAIN="$(grep "channel" /opt/scanopy/backend/rust-toolchain.toml | awk -F\" '{print $2}')"
|
||||||
|
RUST_TOOLCHAIN=$TOOLCHAIN setup_rust
|
||||||
|
|
||||||
|
msg_info "Creating frontend UI"
|
||||||
|
export PUBLIC_SERVER_HOSTNAME=default
|
||||||
|
export PUBLIC_SERVER_PORT=""
|
||||||
|
cd /opt/scanopy/ui
|
||||||
|
$STD npm ci --no-fund --no-audit
|
||||||
|
$STD npm run build
|
||||||
|
msg_ok "Created frontend UI"
|
||||||
|
|
||||||
|
msg_info "Building scanopy-server (patience)"
|
||||||
|
cd /opt/scanopy/backend
|
||||||
|
$STD cargo build --release --bin server
|
||||||
|
mv ./target/release/server /usr/bin/scanopy-server
|
||||||
|
msg_ok "Built scanopy-server"
|
||||||
|
|
||||||
|
msg_info "Building scanopy-daemon"
|
||||||
|
$STD cargo build --release --bin daemon
|
||||||
|
cp ./target/release/daemon /usr/bin/scanopy-daemon
|
||||||
|
msg_ok "Built scanopy-daemon"
|
||||||
|
|
||||||
|
msg_info "Configuring server for first-run"
|
||||||
|
LOCAL_IP="$(hostname -I | awk '{print $1}')"
|
||||||
|
cat <<EOF >/opt/scanopy/.env
|
||||||
|
### - SERVER
|
||||||
|
scanopy_DATABASE_URL=postgresql://$PG_DB_USER:$PG_DB_PASS@localhost:5432/$PG_DB_NAME
|
||||||
|
scanopy_WEB_EXTERNAL_PATH="/opt/scanopy/ui/build"
|
||||||
|
scanopy_PUBLIC_URL=http://${LOCAL_IP}:60072
|
||||||
|
scanopy_SERVER_PORT=60072
|
||||||
|
scanopy_LOG_LEVEL=info
|
||||||
|
scanopy_INTEGRATED_DAEMON_URL=http://127.0.0.1:60073
|
||||||
|
## - uncomment to disable signups
|
||||||
|
# scanopy_DISABLE_REGISTRATION=true
|
||||||
|
## - uncomment when using TLS
|
||||||
|
# scanopy_USE_SECURE_SESSION_COOKIES=true
|
||||||
|
## - see https://github.com/imbolc/axum-client-ip?tab=readme-ov-file#configurable-vs-specific-extractors
|
||||||
|
## - before uncommenting the below
|
||||||
|
# scanopy_CLIENT_IP_SOURCE=
|
||||||
|
|
||||||
|
### - SMTP (password reset and notifications - optional)
|
||||||
|
# scanopy_SMTP_RELAY=smtp.gmail.com:587
|
||||||
|
# scanopy_SMTP_USERNAME=your-email@gmail.com
|
||||||
|
# scanopy_SMTP_PASSWORD=your-app-password
|
||||||
|
# scanopy_SMTP_EMAIL=scanopy@yourdomain.tld
|
||||||
|
|
||||||
|
### - INTEGRATED DAEMON
|
||||||
|
scanopy_SERVER_URL=http://127.0.0.1:60072
|
||||||
|
scanopy_BIND_ADDRESS=0.0.0.0
|
||||||
|
scanopy_NAME="scanopy-daemon"
|
||||||
|
scanopy_HEARTBEAT_INTERVAL=30
|
||||||
|
|
||||||
|
### - see https://github.com/scanopy/scanopy/blob/main/docs/CONFIGURATION.md for more options
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat <<EOF >/etc/systemd/system/scanopy-server.service
|
||||||
|
[Unit]
|
||||||
|
Description=Scanopy Network Discovery Server
|
||||||
|
After=network.target postgresql.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
WorkingDirectory=/opt/scanopy/backend
|
||||||
|
EnvironmentFile=/opt/scanopy/.env
|
||||||
|
ExecStart=/usr/bin/scanopy-server
|
||||||
|
Restart=always
|
||||||
|
RestartSec=10
|
||||||
|
StandardOutput=journal
|
||||||
|
StandardError=journal
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
EOF
|
||||||
|
|
||||||
|
systemctl enable -q --now scanopy-server
|
||||||
|
|
||||||
|
# Creating short script to configure scanopy-daemon
|
||||||
|
cat <<EOF >~/configure_daemon.sh
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
echo "Auto-configuring integrated daemon..."
|
||||||
|
|
||||||
|
NETWORK_ID="\$(sudo -u postgres psql -1 -t -d "${PG_DB_NAME}" -c 'SELECT id FROM networks;')"
|
||||||
|
API_KEY="\$(sudo -u postgres psql -1 -t -d "${PG_DB_NAME}" -c 'SELECT key FROM api_keys;')"
|
||||||
|
|
||||||
|
cat <<END >/etc/systemd/system/scanopy-daemon.service
|
||||||
|
[Unit]
|
||||||
|
Description=Scanopy Network Discovery Daemon
|
||||||
|
After=network-online.target
|
||||||
|
Wants=network-online.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
User=root
|
||||||
|
ExecStart=/usr/bin/scanopy-daemon --server-url http://127.0.0.1:60072 --network-id \${NETWORK_ID} --daemon-api-key \${API_KEY} --mode push
|
||||||
|
Restart=always
|
||||||
|
RestartSec=10
|
||||||
|
StandardOutput=journal
|
||||||
|
StandardError=journal
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
END
|
||||||
|
|
||||||
|
systemctl enable -q --now scanopy-daemon
|
||||||
|
echo "Scanopy daemon configured and running"
|
||||||
|
|
||||||
|
EOF
|
||||||
|
chmod +x ~/configure_daemon.sh
|
||||||
|
msg_ok "Scanopy server running - please create an account in the UI to continue."
|
||||||
|
|
||||||
|
motd_ssh
|
||||||
|
customize
|
||||||
|
cleanup_lxc
|
||||||
@ -440,6 +440,7 @@ base_settings() {
|
|||||||
ENABLE_MKNOD=${var_mknod:-"0"}
|
ENABLE_MKNOD=${var_mknod:-"0"}
|
||||||
PROTECT_CT=${var_protection:-"no"}
|
PROTECT_CT=${var_protection:-"no"}
|
||||||
CT_TIMEZONE=${var_timezone:-"$timezone"}
|
CT_TIMEZONE=${var_timezone:-"$timezone"}
|
||||||
|
[[ "${CT_TIMEZONE:-}" == Etc/* ]] && CT_TIMEZONE="host" # pct doesn't accept Etc/* zones
|
||||||
|
|
||||||
# Since these 2 are only defined outside of default_settings function, we add a temporary fallback. TODO: To align everything, we should add these as constant variables (e.g. OSTYPE and OSVERSION), but that would currently require updating the default_settings function for all existing scripts
|
# Since these 2 are only defined outside of default_settings function, we add a temporary fallback. TODO: To align everything, we should add these as constant variables (e.g. OSTYPE and OSVERSION), but that would currently require updating the default_settings function for all existing scripts
|
||||||
if [ -z "$var_os" ]; then
|
if [ -z "$var_os" ]; then
|
||||||
@ -1072,7 +1073,10 @@ advanced_settings() {
|
|||||||
elif [ -f /etc/timezone ]; then
|
elif [ -f /etc/timezone ]; then
|
||||||
_host_timezone=$(cat /etc/timezone 2>/dev/null || echo "")
|
_host_timezone=$(cat /etc/timezone 2>/dev/null || echo "")
|
||||||
fi
|
fi
|
||||||
|
# Map Etc/* timezones to "host" (pct doesn't accept Etc/* zones)
|
||||||
|
[[ "${_host_timezone:-}" == Etc/* ]] && _host_timezone="host"
|
||||||
local _ct_timezone="${var_timezone:-$_host_timezone}"
|
local _ct_timezone="${var_timezone:-$_host_timezone}"
|
||||||
|
[[ "${_ct_timezone:-}" == Etc/* ]] && _ct_timezone="host"
|
||||||
|
|
||||||
# Helper to show current progress
|
# Helper to show current progress
|
||||||
show_progress() {
|
show_progress() {
|
||||||
@ -1692,6 +1696,7 @@ advanced_settings() {
|
|||||||
--inputbox "\nSet container timezone.\n\nExamples: Europe/Berlin, America/New_York, Asia/Tokyo\n\nHost timezone: ${_host_timezone:-unknown}\n\nLeave empty to inherit from host." 16 62 "$_ct_timezone" \
|
--inputbox "\nSet container timezone.\n\nExamples: Europe/Berlin, America/New_York, Asia/Tokyo\n\nHost timezone: ${_host_timezone:-unknown}\n\nLeave empty to inherit from host." 16 62 "$_ct_timezone" \
|
||||||
3>&1 1>&2 2>&3); then
|
3>&1 1>&2 2>&3); then
|
||||||
_ct_timezone="$result"
|
_ct_timezone="$result"
|
||||||
|
[[ "${_ct_timezone:-}" == Etc/* ]] && _ct_timezone="host" # pct doesn't accept Etc/* zones
|
||||||
((STEP++))
|
((STEP++))
|
||||||
else
|
else
|
||||||
((STEP--))
|
((STEP--))
|
||||||
@ -2081,6 +2086,7 @@ install_script() {
|
|||||||
else
|
else
|
||||||
timezone="UTC"
|
timezone="UTC"
|
||||||
fi
|
fi
|
||||||
|
[[ "${timezone:-}" == Etc/* ]] && timezone="host" # pct doesn't accept Etc/* zones
|
||||||
|
|
||||||
# Show APP Header
|
# Show APP Header
|
||||||
header_info
|
header_info
|
||||||
@ -2682,10 +2688,12 @@ $PCT_OPTIONS_STRING"
|
|||||||
-protection 1"
|
-protection 1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Timezone flag (if var_timezone was set)
|
# Timezone (map Etc/* to "host" as pct doesn't accept them)
|
||||||
if [ -n "${CT_TIMEZONE:-}" ]; then
|
if [ -n "${CT_TIMEZONE:-}" ]; then
|
||||||
|
local _pct_timezone="$CT_TIMEZONE"
|
||||||
|
[[ "$_pct_timezone" == Etc/* ]] && _pct_timezone="host"
|
||||||
PCT_OPTIONS_STRING="$PCT_OPTIONS_STRING
|
PCT_OPTIONS_STRING="$PCT_OPTIONS_STRING
|
||||||
-timezone $CT_TIMEZONE"
|
-timezone $_pct_timezone"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Password (already formatted)
|
# Password (already formatted)
|
||||||
@ -3036,8 +3044,9 @@ EOF'
|
|||||||
export LANG=\$locale_line"
|
export LANG=\$locale_line"
|
||||||
|
|
||||||
if [[ -z "${tz:-}" ]]; then
|
if [[ -z "${tz:-}" ]]; then
|
||||||
tz=$(timedatectl show --property=Timezone --value 2>/dev/null || echo "Etc/UTC")
|
tz=$(timedatectl show --property=Timezone --value 2>/dev/null || echo "UTC")
|
||||||
fi
|
fi
|
||||||
|
[[ "${tz:-}" == Etc/* ]] && tz="UTC" # Normalize Etc/* to UTC for container setup
|
||||||
|
|
||||||
if pct exec "$CTID" -- test -e "/usr/share/zoneinfo/$tz"; then
|
if pct exec "$CTID" -- test -e "/usr/share/zoneinfo/$tz"; then
|
||||||
# Set timezone using symlink (Debian 13+ compatible)
|
# Set timezone using symlink (Debian 13+ compatible)
|
||||||
|
|||||||
@ -1222,6 +1222,7 @@ setup_deb822_repo() {
|
|||||||
local suite="$4"
|
local suite="$4"
|
||||||
local component="${5:-main}"
|
local component="${5:-main}"
|
||||||
local architectures="${6-}" # optional
|
local architectures="${6-}" # optional
|
||||||
|
local enabled="${7-}" # optional: "true" or "false"
|
||||||
|
|
||||||
# Validate required parameters
|
# Validate required parameters
|
||||||
if [[ -z "$name" || -z "$gpg_url" || -z "$repo_url" || -z "$suite" ]]; then
|
if [[ -z "$name" || -z "$gpg_url" || -z "$repo_url" || -z "$suite" ]]; then
|
||||||
@ -1255,6 +1256,7 @@ setup_deb822_repo() {
|
|||||||
fi
|
fi
|
||||||
[[ -n "$architectures" ]] && echo "Architectures: $architectures"
|
[[ -n "$architectures" ]] && echo "Architectures: $architectures"
|
||||||
echo "Signed-By: /etc/apt/keyrings/${name}.gpg"
|
echo "Signed-By: /etc/apt/keyrings/${name}.gpg"
|
||||||
|
[[ -n "$enabled" ]] && echo "Enabled: $enabled"
|
||||||
} >/etc/apt/sources.list.d/${name}.sources
|
} >/etc/apt/sources.list.d/${name}.sources
|
||||||
|
|
||||||
$STD apt update
|
$STD apt update
|
||||||
|
|||||||
Reference in New Issue
Block a user