mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-09-15 17:24:10 +00:00
Compare commits
1 Commits
fix-romm-l
...
fix/truena
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b7ebcf9ab |
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"
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -578,7 +578,8 @@ qm create "$VMID" -machine q35 -bios ovmf -agent enabled=1 -tablet 0 -localtime
|
||||
-cores "$CORE_COUNT" -memory "$RAM_SIZE" -balloon 0 -name "$HN" -tags community-script \
|
||||
-net0 "virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU" -onboot 1 -ostype l26 \
|
||||
-efidisk0 $STORAGE:1,efitype=4m,pre-enrolled-keys=0 -sata0 $STORAGE:$DISK_SIZE,ssd=1 \
|
||||
-scsihw virtio-scsi-single -cdrom local:iso/$ISO_NAME -vga virtio >/dev/null
|
||||
-scsihw virtio-scsi-single -cdrom local:iso/$ISO_NAME -vga virtio \
|
||||
-boot order='sata0;ide2' >/dev/null
|
||||
msg_ok "Created VM shell"
|
||||
|
||||
if [ "$IMPORT_DISKS" == "yes" ]; then
|
||||
|
||||
Reference in New Issue
Block a user