mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2025-11-08 20:32:49 +00:00
Compare commits
13 Commits
2025-11-07
...
github-act
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
51fbf2e359 | ||
|
|
e8846642ef | ||
|
|
8cb1675f89 | ||
|
|
a4ccf7d1b0 | ||
|
|
db29b241a9 | ||
|
|
528575f737 | ||
|
|
ac05febbbd | ||
|
|
bd8f8e6a0d | ||
|
|
0fb4e4ad8c | ||
|
|
5d381910a3 | ||
|
|
9f0720dc91 | ||
|
|
85456ff3f3 | ||
|
|
822ea4b267 |
14
CHANGELOG.md
14
CHANGELOG.md
@@ -12,6 +12,20 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
|||||||
|
|
||||||
## 2025-11-08
|
## 2025-11-08
|
||||||
|
|
||||||
|
### 🚀 Updated Scripts
|
||||||
|
|
||||||
|
- #### 🐞 Bug Fixes
|
||||||
|
|
||||||
|
- Technitium DNS: Fix update [@tremor021](https://github.com/tremor021) ([#8980](https://github.com/community-scripts/ProxmoxVE/pull/8980))
|
||||||
|
- MediaManager: add LOG_FILE to start.sh script; fix BASE_PATH and PUBLIC_API_URL [@vhsdream](https://github.com/vhsdream) ([#8981](https://github.com/community-scripts/ProxmoxVE/pull/8981))
|
||||||
|
- Firefly: Fix missing command in update script [@tremor021](https://github.com/tremor021) ([#8972](https://github.com/community-scripts/ProxmoxVE/pull/8972))
|
||||||
|
- MongoDB: Remove unused message [@tremor021](https://github.com/tremor021) ([#8969](https://github.com/community-scripts/ProxmoxVE/pull/8969))
|
||||||
|
- Set TZ=Etc/UTC in Ghostfolio installation script [@LuloDev](https://github.com/LuloDev) ([#8961](https://github.com/community-scripts/ProxmoxVE/pull/8961))
|
||||||
|
|
||||||
|
- #### 🔧 Refactor
|
||||||
|
|
||||||
|
- Refactor setup_deb822_repo for optional architectures [@MickLesk](https://github.com/MickLesk) ([#8983](https://github.com/community-scripts/ProxmoxVE/pull/8983))
|
||||||
|
|
||||||
## 2025-11-07
|
## 2025-11-07
|
||||||
|
|
||||||
### 🆕 New Scripts
|
### 🆕 New Scripts
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ function update_script() {
|
|||||||
find /opt/firefly/storage -type f -exec chmod 664 {} \;
|
find /opt/firefly/storage -type f -exec chmod 664 {} \;
|
||||||
mkdir -p /opt/firefly/storage/framework/{cache/data,sessions,views}
|
mkdir -p /opt/firefly/storage/framework/{cache/data,sessions,views}
|
||||||
$STD sudo -u www-data php /opt/firefly/artisan cache:clear
|
$STD sudo -u www-data php /opt/firefly/artisan cache:clear
|
||||||
|
cd /opt/firefly
|
||||||
$STD php artisan migrate --seed --force
|
$STD php artisan migrate --seed --force
|
||||||
$STD php artisan cache:clear
|
$STD php artisan cache:clear
|
||||||
$STD php artisan view:clear
|
$STD php artisan view:clear
|
||||||
|
|||||||
@@ -40,19 +40,24 @@ function update_script() {
|
|||||||
MM_DIR="/opt/mm"
|
MM_DIR="/opt/mm"
|
||||||
export CONFIG_DIR="${MM_DIR}/config"
|
export CONFIG_DIR="${MM_DIR}/config"
|
||||||
export FRONTEND_FILES_DIR="${MM_DIR}/web/build"
|
export FRONTEND_FILES_DIR="${MM_DIR}/web/build"
|
||||||
export BASE_PATH=""
|
|
||||||
export PUBLIC_VERSION=""
|
export PUBLIC_VERSION=""
|
||||||
export PUBLIC_API_URL=""
|
export PUBLIC_API_URL=""
|
||||||
|
export BASE_PATH="/web"
|
||||||
cd /opt/mediamanager/web
|
cd /opt/mediamanager/web
|
||||||
$STD npm ci
|
$STD npm ci --no-fund --no-audit
|
||||||
$STD npm run build
|
$STD npm run build
|
||||||
rm -rf "$FRONTEND_FILES_DIR"/build
|
rm -rf "$FRONTEND_FILES_DIR"/build
|
||||||
cp -r build "$FRONTEND_FILES_DIR"
|
cp -r build "$FRONTEND_FILES_DIR"
|
||||||
|
export BASE_PATH=""
|
||||||
export VIRTUAL_ENV="/opt/${MM_DIR}/venv"
|
export VIRTUAL_ENV="/opt/${MM_DIR}/venv"
|
||||||
cd /opt/mediamanager
|
cd /opt/mediamanager
|
||||||
rm -rf "$MM_DIR"/{media_manager,alembic*}
|
rm -rf "$MM_DIR"/{media_manager,alembic*}
|
||||||
cp -r {media_manager,alembic*} "$MM_DIR"
|
cp -r {media_manager,alembic*} "$MM_DIR"
|
||||||
$STD /usr/local/bin/uv sync --locked --active -n -p cpython3.13 --managed-python
|
$STD /usr/local/bin/uv sync --locked --active -n -p cpython3.13 --managed-python
|
||||||
|
if ! grep -q "LOG_FILE" "$MM_DIR"/start.sh; then
|
||||||
|
sed -i "\|build\"$|a\export LOG_FILE=\"$CONFIG_DIR/media_manager.log\"" "$MM_DIR"/start.sh
|
||||||
|
fi
|
||||||
|
|
||||||
msg_ok "Updated $APP"
|
msg_ok "Updated $APP"
|
||||||
|
|
||||||
msg_info "Starting Service"
|
msg_info "Starting Service"
|
||||||
|
|||||||
@@ -28,6 +28,11 @@ function update_script() {
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if is_package_installed "aspnetcore-runtime-8.0"; then
|
||||||
|
$STD apt remove -y aspnetcore-runtime-8.0
|
||||||
|
$STD apt install -y aspnetcore-runtime-9.0
|
||||||
|
fi
|
||||||
|
|
||||||
RELEASE=$(curl -fsSL https://technitium.com/dns/ | grep -oP 'Version \K[\d.]+')
|
RELEASE=$(curl -fsSL https://technitium.com/dns/ | grep -oP 'Version \K[\d.]+')
|
||||||
if [[ ! -f ~/.technitium || "${RELEASE}" != "$(cat ~/.technitium)" ]]; then
|
if [[ ! -f ~/.technitium || "${RELEASE}" != "$(cat ~/.technitium)" ]]; then
|
||||||
msg_info "Updating Technitium DNS"
|
msg_info "Updating Technitium DNS"
|
||||||
|
|||||||
@@ -1,14 +1,69 @@
|
|||||||
[
|
[
|
||||||
|
{
|
||||||
|
"name": "TechnitiumSoftware/DnsServer",
|
||||||
|
"version": "v14.0.0",
|
||||||
|
"date": "2025-11-08T10:34:10Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "firefly-iii/firefly-iii",
|
||||||
|
"version": "v6.4.5",
|
||||||
|
"date": "2025-11-08T10:24:28Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "runtipi/runtipi",
|
||||||
|
"version": "v4.6.3",
|
||||||
|
"date": "2025-11-08T10:06:18Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "fuma-nama/fumadocs",
|
||||||
|
"version": "fumadocs-openapi@10.0.2",
|
||||||
|
"date": "2025-11-08T09:58:09Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pommee/goaway",
|
||||||
|
"version": "v0.62.14",
|
||||||
|
"date": "2025-11-08T09:46:33Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "pocketbase/pocketbase",
|
||||||
|
"version": "v0.32.0",
|
||||||
|
"date": "2025-11-08T09:36:27Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "chrisvel/tududi",
|
||||||
|
"version": "v0.85.1",
|
||||||
|
"date": "2025-10-31T10:45:26Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Jackett/Jackett",
|
||||||
|
"version": "v0.24.262",
|
||||||
|
"date": "2025-11-08T05:54:55Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "documenso/documenso",
|
||||||
|
"version": "v2.0.5",
|
||||||
|
"date": "2025-11-08T05:03:59Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "jeedom/core",
|
||||||
|
"version": "4.4.20",
|
||||||
|
"date": "2025-11-08T00:27:05Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "steveiliop56/tinyauth",
|
||||||
|
"version": "v4.0.1",
|
||||||
|
"date": "2025-10-15T16:53:55Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "keycloak/keycloak",
|
||||||
|
"version": "26.4.4",
|
||||||
|
"date": "2025-11-07T08:55:27Z"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "home-assistant/core",
|
"name": "home-assistant/core",
|
||||||
"version": "2025.11.1",
|
"version": "2025.11.1",
|
||||||
"date": "2025-11-07T21:32:26Z"
|
"date": "2025-11-07T21:32:26Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "firefly-iii/firefly-iii",
|
|
||||||
"version": "v6.4.4",
|
|
||||||
"date": "2025-11-01T19:48:08Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "homarr-labs/homarr",
|
"name": "homarr-labs/homarr",
|
||||||
"version": "v1.43.2",
|
"version": "v1.43.2",
|
||||||
@@ -19,11 +74,6 @@
|
|||||||
"version": "v2.16.45",
|
"version": "v2.16.45",
|
||||||
"date": "2025-11-07T19:08:05Z"
|
"date": "2025-11-07T19:08:05Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "runtipi/runtipi",
|
|
||||||
"version": "nightly",
|
|
||||||
"date": "2025-11-04T19:16:17Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "rcourtman/Pulse",
|
"name": "rcourtman/Pulse",
|
||||||
"version": "v4.26.5",
|
"version": "v4.26.5",
|
||||||
@@ -39,26 +89,11 @@
|
|||||||
"version": "v3.6.0",
|
"version": "v3.6.0",
|
||||||
"date": "2025-11-07T15:34:35Z"
|
"date": "2025-11-07T15:34:35Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "chrisvel/tududi",
|
|
||||||
"version": "v0.85.1",
|
|
||||||
"date": "2025-10-31T10:45:26Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "YunoHost/yunohost",
|
"name": "YunoHost/yunohost",
|
||||||
"version": "debian/12.1.35",
|
"version": "debian/12.1.35",
|
||||||
"date": "2025-11-07T14:35:24Z"
|
"date": "2025-11-07T14:35:24Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "fuma-nama/fumadocs",
|
|
||||||
"version": "fumadocs-openapi@10.0.1",
|
|
||||||
"date": "2025-11-07T14:06:43Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "documenso/documenso",
|
|
||||||
"version": "v2.0.2",
|
|
||||||
"date": "2025-11-07T13:48:31Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "nzbgetcom/nzbget",
|
"name": "nzbgetcom/nzbget",
|
||||||
"version": "v25.4",
|
"version": "v25.4",
|
||||||
@@ -94,11 +129,6 @@
|
|||||||
"version": "coverity-w45-4.14.1",
|
"version": "coverity-w45-4.14.1",
|
||||||
"date": "2025-11-05T16:56:57Z"
|
"date": "2025-11-05T16:56:57Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "keycloak/keycloak",
|
|
||||||
"version": "26.4.4",
|
|
||||||
"date": "2025-11-07T08:55:27Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "mattermost/mattermost",
|
"name": "mattermost/mattermost",
|
||||||
"version": "v10.11.6",
|
"version": "v10.11.6",
|
||||||
@@ -109,26 +139,11 @@
|
|||||||
"version": "v3.0.0",
|
"version": "v3.0.0",
|
||||||
"date": "2025-11-07T06:13:49Z"
|
"date": "2025-11-07T06:13:49Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "Jackett/Jackett",
|
|
||||||
"version": "v0.24.255",
|
|
||||||
"date": "2025-11-07T05:55:20Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "OliveTin/OliveTin",
|
"name": "OliveTin/OliveTin",
|
||||||
"version": "3000.3.2",
|
"version": "3000.3.2",
|
||||||
"date": "2025-11-07T01:05:59Z"
|
"date": "2025-11-07T01:05:59Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "jeedom/core",
|
|
||||||
"version": "4.4.20",
|
|
||||||
"date": "2025-11-07T00:27:13Z"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "steveiliop56/tinyauth",
|
|
||||||
"version": "v4.0.1",
|
|
||||||
"date": "2025-10-15T16:53:55Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "FlowiseAI/Flowise",
|
"name": "FlowiseAI/Flowise",
|
||||||
"version": "flowise@3.0.10",
|
"version": "flowise@3.0.10",
|
||||||
@@ -479,11 +494,6 @@
|
|||||||
"version": "v3.4.0",
|
"version": "v3.4.0",
|
||||||
"date": "2025-10-31T18:50:18Z"
|
"date": "2025-10-31T18:50:18Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "pommee/goaway",
|
|
||||||
"version": "v0.62.12",
|
|
||||||
"date": "2025-10-31T17:30:55Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "zabbix/zabbix",
|
"name": "zabbix/zabbix",
|
||||||
"version": "7.4.5",
|
"version": "7.4.5",
|
||||||
@@ -689,11 +699,6 @@
|
|||||||
"version": "v1.7.3",
|
"version": "v1.7.3",
|
||||||
"date": "2025-10-24T10:51:12Z"
|
"date": "2025-10-24T10:51:12Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "pocketbase/pocketbase",
|
|
||||||
"version": "v0.31.0",
|
|
||||||
"date": "2025-10-24T04:07:27Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "drakkan/sftpgo",
|
"name": "drakkan/sftpgo",
|
||||||
"version": "v2.7.0",
|
"version": "v2.7.0",
|
||||||
@@ -1349,11 +1354,6 @@
|
|||||||
"version": "2025-05-07-r1",
|
"version": "2025-05-07-r1",
|
||||||
"date": "2025-05-07T12:18:42Z"
|
"date": "2025-05-07T12:18:42Z"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "TechnitiumSoftware/DnsServer",
|
|
||||||
"version": "v13.6.0",
|
|
||||||
"date": "2025-04-26T10:21:12Z"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "dotnetfactory/fluid-calendar",
|
"name": "dotnetfactory/fluid-calendar",
|
||||||
"version": "v1.4.0",
|
"version": "v1.4.0",
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ JWT_SECRET_KEY=$JWT_SECRET_KEY
|
|||||||
NODE_ENV=production
|
NODE_ENV=production
|
||||||
PORT=3333
|
PORT=3333
|
||||||
HOST=0.0.0.0
|
HOST=0.0.0.0
|
||||||
|
TZ=Etc/UTC
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if [[ -n "${COINGECKO_DEMO_KEY:-}" ]]; then
|
if [[ -n "${COINGECKO_DEMO_KEY:-}" ]]; then
|
||||||
|
|||||||
@@ -45,15 +45,15 @@ MM_DIR="/opt/mm"
|
|||||||
MEDIA_DIR="${MM_DIR}/media"
|
MEDIA_DIR="${MM_DIR}/media"
|
||||||
export CONFIG_DIR="${MM_DIR}/config"
|
export CONFIG_DIR="${MM_DIR}/config"
|
||||||
export FRONTEND_FILES_DIR="${MM_DIR}/web/build"
|
export FRONTEND_FILES_DIR="${MM_DIR}/web/build"
|
||||||
export BASE_PATH=""
|
|
||||||
export PUBLIC_VERSION=""
|
export PUBLIC_VERSION=""
|
||||||
export PUBLIC_API_URL=""
|
export PUBLIC_API_URL=""
|
||||||
export BASE_PATH=""
|
export BASE_PATH="/web"
|
||||||
cd /opt/mediamanager/web
|
cd /opt/mediamanager/web
|
||||||
$STD npm ci
|
$STD npm ci --no-fund --no-audit
|
||||||
$STD npm run build
|
$STD npm run build
|
||||||
mkdir -p {"$MM_DIR"/web,"$MEDIA_DIR","$CONFIG_DIR"}
|
mkdir -p {"$MM_DIR"/web,"$MEDIA_DIR","$CONFIG_DIR"}
|
||||||
cp -r build "$FRONTEND_FILES_DIR"
|
cp -r build "$FRONTEND_FILES_DIR"
|
||||||
|
export BASE_PATH=""
|
||||||
export VIRTUAL_ENV="${MM_DIR}/venv"
|
export VIRTUAL_ENV="${MM_DIR}/venv"
|
||||||
cd /opt/mediamanager
|
cd /opt/mediamanager
|
||||||
cp -r {media_manager,alembic*} "$MM_DIR"
|
cp -r {media_manager,alembic*} "$MM_DIR"
|
||||||
@@ -81,8 +81,9 @@ cat <<EOF >"$MM_DIR"/start.sh
|
|||||||
|
|
||||||
export CONFIG_DIR="$CONFIG_DIR"
|
export CONFIG_DIR="$CONFIG_DIR"
|
||||||
export FRONTEND_FILES_DIR="$FRONTEND_FILES_DIR"
|
export FRONTEND_FILES_DIR="$FRONTEND_FILES_DIR"
|
||||||
|
export LOG_FILE="$CONFIG_DIR/media_manager.log"
|
||||||
export BASE_PATH=""
|
export BASE_PATH=""
|
||||||
cd "$MM_DIR"
|
cd $MM_DIR
|
||||||
source ./venv/bin/activate
|
source ./venv/bin/activate
|
||||||
/usr/local/bin/uv run alembic upgrade head
|
/usr/local/bin/uv run alembic upgrade head
|
||||||
/usr/local/bin/uv run fastapi run ./media_manager/main.py --port 8000
|
/usr/local/bin/uv run fastapi run ./media_manager/main.py --port 8000
|
||||||
|
|||||||
@@ -20,13 +20,7 @@ else
|
|||||||
MONGO_VERSION="7.0" setup_mongodb
|
MONGO_VERSION="7.0" setup_mongodb
|
||||||
fi
|
fi
|
||||||
sed -i 's/bindIp: 127.0.0.1/bindIp: 0.0.0.0/' /etc/mongod.conf
|
sed -i 's/bindIp: 127.0.0.1/bindIp: 0.0.0.0/' /etc/mongod.conf
|
||||||
msg_ok "Installed MongoDB $MONGO_VERSION"
|
|
||||||
|
|
||||||
motd_ssh
|
motd_ssh
|
||||||
customize
|
customize
|
||||||
|
cleanup_lxc
|
||||||
msg_info "Cleaning up"
|
|
||||||
$STD apt -y autoremove
|
|
||||||
$STD apt -y autoclean
|
|
||||||
$STD apt -y clean
|
|
||||||
msg_ok "Cleaned"
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ curl -fsSL "https://packages.microsoft.com/config/debian/12/packages-microsoft-p
|
|||||||
$STD dpkg -i packages-microsoft-prod.deb
|
$STD dpkg -i packages-microsoft-prod.deb
|
||||||
rm -rf packages-microsoft-prod.deb
|
rm -rf packages-microsoft-prod.deb
|
||||||
$STD apt update
|
$STD apt update
|
||||||
$STD apt install -y aspnetcore-runtime-8.0
|
$STD apt install -y aspnetcore-runtime-9.0
|
||||||
msg_ok "Installed ASP.NET Core Runtime"
|
msg_ok "Installed ASP.NET Core Runtime"
|
||||||
|
|
||||||
RELEASE=$(curl -fsSL https://technitium.com/dns/ | grep -oP 'Version \K[\d.]+')
|
RELEASE=$(curl -fsSL https://technitium.com/dns/ | grep -oP 'Version \K[\d.]+')
|
||||||
@@ -26,6 +26,7 @@ msg_info "Installing Technitium DNS"
|
|||||||
mkdir -p /opt/technitium/dns
|
mkdir -p /opt/technitium/dns
|
||||||
curl -fsSL "https://download.technitium.com/dns/DnsServerPortable.tar.gz" -o /opt/DnsServerPortable.tar.gz
|
curl -fsSL "https://download.technitium.com/dns/DnsServerPortable.tar.gz" -o /opt/DnsServerPortable.tar.gz
|
||||||
$STD tar zxvf /opt/DnsServerPortable.tar.gz -C /opt/technitium/dns/
|
$STD tar zxvf /opt/DnsServerPortable.tar.gz -C /opt/technitium/dns/
|
||||||
|
rm -f /opt/DnsServerPortable.tar.gz
|
||||||
echo "${RELEASE}" >~/.technitium
|
echo "${RELEASE}" >~/.technitium
|
||||||
msg_ok "Installed Technitium DNS"
|
msg_ok "Installed Technitium DNS"
|
||||||
|
|
||||||
@@ -36,10 +37,4 @@ msg_ok "Service created"
|
|||||||
|
|
||||||
motd_ssh
|
motd_ssh
|
||||||
customize
|
customize
|
||||||
|
cleanup_lxc
|
||||||
msg_info "Cleaning up"
|
|
||||||
rm -f /opt/DnsServerPortable.tar.gz
|
|
||||||
$STD apt -y autoremove
|
|
||||||
$STD apt -y autoclean
|
|
||||||
$STD apt -y clean
|
|
||||||
msg_ok "Cleaned"
|
|
||||||
|
|||||||
@@ -1198,8 +1198,8 @@ ensure_apt_working() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
# Standardized deb822 repository setup
|
# Standardized deb822 repository setup (with optional Architectures)
|
||||||
# Validates all parameters and fails safely if any are empty
|
# Always runs apt update after repo creation to ensure package availability
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
setup_deb822_repo() {
|
setup_deb822_repo() {
|
||||||
local name="$1"
|
local name="$1"
|
||||||
@@ -1207,56 +1207,40 @@ setup_deb822_repo() {
|
|||||||
local repo_url="$3"
|
local repo_url="$3"
|
||||||
local suite="$4"
|
local suite="$4"
|
||||||
local component="${5:-main}"
|
local component="${5:-main}"
|
||||||
local architectures="${6:-$(dpkg --print-architecture)}"
|
local architectures="$6" # optional
|
||||||
|
|
||||||
# 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
|
||||||
msg_error "setup_deb822_repo: missing required parameters (name=$name, gpg=$gpg_url, repo=$repo_url, suite=$suite)"
|
msg_error "setup_deb822_repo: missing required parameters (name=$name repo=$repo_url suite=$suite)"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Cleanup old configs for this app
|
# Cleanup
|
||||||
cleanup_old_repo_files "$name"
|
cleanup_old_repo_files "$name"
|
||||||
|
|
||||||
# Cleanup any orphaned .sources files from other apps
|
|
||||||
cleanup_orphaned_sources
|
cleanup_orphaned_sources
|
||||||
|
|
||||||
# Ensure keyring directory exists
|
|
||||||
mkdir -p /etc/apt/keyrings || {
|
mkdir -p /etc/apt/keyrings || {
|
||||||
msg_error "Failed to create /etc/apt/keyrings directory"
|
msg_error "Failed to create /etc/apt/keyrings"
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# Download GPG key (with --yes to avoid interactive prompts)
|
# Import GPG
|
||||||
curl -fsSL "$gpg_url" | gpg --dearmor --yes -o "/etc/apt/keyrings/${name}.gpg" 2>/dev/null || {
|
curl -fsSL "$gpg_url" | gpg --dearmor --yes -o "/etc/apt/keyrings/${name}.gpg" || {
|
||||||
msg_error "Failed to download or import GPG key for ${name} from $gpg_url"
|
msg_error "Failed to import GPG key for ${name}"
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# Create deb822 sources file
|
# Write deb822
|
||||||
cat <<EOF >/etc/apt/sources.list.d/${name}.sources
|
{
|
||||||
Types: deb
|
echo "Types: deb"
|
||||||
URIs: $repo_url
|
echo "URIs: $repo_url"
|
||||||
Suites: $suite
|
echo "Suites: $suite"
|
||||||
Components: $component
|
echo "Components: $component"
|
||||||
Architectures: $architectures
|
[[ -n "$architectures" ]] && echo "Architectures: $architectures"
|
||||||
Signed-By: /etc/apt/keyrings/${name}.gpg
|
echo "Signed-By: /etc/apt/keyrings/${name}.gpg"
|
||||||
EOF
|
} >/etc/apt/sources.list.d/${name}.sources
|
||||||
|
|
||||||
# Use cached apt update
|
|
||||||
local apt_cache_file="/var/cache/apt-update-timestamp"
|
|
||||||
local current_time=$(date +%s)
|
|
||||||
local last_update=0
|
|
||||||
|
|
||||||
if [[ -f "$apt_cache_file" ]]; then
|
|
||||||
last_update=$(cat "$apt_cache_file" 2>/dev/null || echo 0)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For repo changes, always update but respect short-term cache (30s)
|
|
||||||
if ((current_time - last_update > 30)); then
|
|
||||||
$STD apt update
|
$STD apt update
|
||||||
echo "$current_time" >"$apt_cache_file"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user