mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-09-15 17:24:10 +00:00
Compare commits
2 Commits
fix-romm-l
...
fix-docmos
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f44159be2a | ||
|
|
039e65d803 |
@@ -558,7 +558,8 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
||||
|
||||
### 💾 Core
|
||||
|
||||
- Releases: rank releases on their numbers, not on sort -V over the raw tag [@MickLesk](https://github.com/MickLesk) ([core#39](https://github.com/community-scripts/core/pull/39))
|
||||
- Add vm_extract_image, which two VM scripts already call [@MickLesk](https://github.com/MickLesk) ([core#40](https://github.com/community-scripts/core/pull/40))
|
||||
- Releases: rank releases on their numbers, not on sort -V over the raw tag [@MickLesk](https://github.com/MickLesk) ([core#39](https://github.com/community-scripts/core/pull/39))
|
||||
|
||||
### 🧰 Tools
|
||||
|
||||
|
||||
@@ -57,6 +57,7 @@ function update_script() {
|
||||
|
||||
msg_info "Configuring Docmost"
|
||||
cd /opt/docmost
|
||||
export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
|
||||
$STD pnpm install --force
|
||||
$STD pnpm build
|
||||
msg_ok "Configured Docmost"
|
||||
|
||||
19
ct/romm.sh
19
ct/romm.sh
@@ -191,30 +191,11 @@ EOF
|
||||
sed -i -e "s|alias .*/library/;|alias ${ROMM_BASE}/library/;|" \
|
||||
-e "s|alias .*/cache/;|alias ${ROMM_BASE}/cache/;|" /etc/angie/http.d/romm.conf
|
||||
fi
|
||||
cat <<'SYNCEOF' >/usr/local/bin/romm-sync-angie-paths
|
||||
#!/usr/bin/env bash
|
||||
base="$(grep -m1 '^ROMM_BASE_PATH=' /opt/romm/.env 2>/dev/null | cut -d= -f2)"
|
||||
base="${base:-/var/lib/romm}"
|
||||
[[ -f /etc/angie/http.d/romm.conf ]] || exit 0
|
||||
sed -i -e "s|alias .*/library/;|alias ${base}/library/;|" \
|
||||
-e "s|alias .*/cache/;|alias ${base}/cache/;|" /etc/angie/http.d/romm.conf
|
||||
SYNCEOF
|
||||
chmod +x /usr/local/bin/romm-sync-angie-paths
|
||||
mkdir -p /etc/systemd/system/angie.service.d
|
||||
cat <<'DROPEOF' >/etc/systemd/system/angie.service.d/romm-paths.conf
|
||||
[Service]
|
||||
ExecStartPre=/usr/local/bin/romm-sync-angie-paths
|
||||
DROPEOF
|
||||
systemctl daemon-reload
|
||||
systemctl reload angie
|
||||
elif [[ -f /etc/nginx/sites-available/romm ]]; then
|
||||
sed -i "s|alias .*/library/;|alias ${ROMM_BASE}/library/;|" /etc/nginx/sites-available/romm
|
||||
nginx_enable_site romm
|
||||
fi
|
||||
if [[ -f /etc/systemd/system/romm-watcher.service ]]; then
|
||||
sed -i "s|\(watcher\.py' \).*|\1\${ROMM_BASE_PATH}/library|" /etc/systemd/system/romm-watcher.service
|
||||
systemctl daemon-reload
|
||||
fi
|
||||
msg_ok "Updated ROMM"
|
||||
|
||||
msg_info "Starting Services"
|
||||
|
||||
@@ -48,6 +48,7 @@ sed -i -e "s|APP_SECRET=.*|APP_SECRET=$(openssl rand -base64 32 | tr -dc 'a-zA-Z
|
||||
-e "s|^STORAGE_DRIVER=azure|#STORAGE_DRIVER=azure|" \
|
||||
/opt/docmost/.env
|
||||
export NODE_OPTIONS="--max-old-space-size=2048"
|
||||
export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
|
||||
$STD pnpm install
|
||||
$STD pnpm build
|
||||
msg_ok "Configured Docmost"
|
||||
|
||||
@@ -327,22 +327,8 @@ server {
|
||||
}
|
||||
EOF
|
||||
|
||||
cat <<'SYNCEOF' >/usr/local/bin/romm-sync-angie-paths
|
||||
#!/usr/bin/env bash
|
||||
base="$(grep -m1 '^ROMM_BASE_PATH=' /opt/romm/.env 2>/dev/null | cut -d= -f2)"
|
||||
base="${base:-/var/lib/romm}"
|
||||
[[ -f /etc/angie/http.d/romm.conf ]] || exit 0
|
||||
sed -i -e "s|alias .*/library/;|alias ${base}/library/;|" \
|
||||
-e "s|alias .*/cache/;|alias ${base}/cache/;|" /etc/angie/http.d/romm.conf
|
||||
SYNCEOF
|
||||
chmod +x /usr/local/bin/romm-sync-angie-paths
|
||||
mkdir -p /etc/systemd/system/angie.service.d
|
||||
cat <<'EOF' >/etc/systemd/system/angie.service.d/romm-paths.conf
|
||||
[Service]
|
||||
ExecStartPre=/usr/local/bin/romm-sync-angie-paths
|
||||
EOF
|
||||
systemctl daemon-reload
|
||||
/usr/local/bin/romm-sync-angie-paths
|
||||
sed -i -e "s|alias /var/lib/romm/library/;|alias ${ROMM_BASE}/library/;|" \
|
||||
-e "s|alias /var/lib/romm/cache/;|alias ${ROMM_BASE}/cache/;|" /etc/angie/http.d/romm.conf
|
||||
rm -f /etc/angie/http.d/default.conf
|
||||
systemctl restart angie
|
||||
systemctl enable -q --now angie
|
||||
@@ -419,7 +405,7 @@ Type=simple
|
||||
WorkingDirectory=/opt/romm/backend
|
||||
EnvironmentFile=/opt/romm/.env
|
||||
Environment="PYTHONPATH=/opt/romm/backend"
|
||||
ExecStart=/opt/romm/.venv/bin/watchfiles --target-type command '/opt/romm/.venv/bin/python watcher.py' \${ROMM_BASE_PATH}/library
|
||||
ExecStart=/opt/romm/.venv/bin/watchfiles --target-type command '/opt/romm/.venv/bin/python watcher.py' /var/lib/romm/library
|
||||
Restart=on-failure
|
||||
RestartSec=5
|
||||
|
||||
|
||||
Reference in New Issue
Block a user