Explorar o código

fix(update): automatically migrate /etc/proxmox-router config to /etc/debtik and preserve mstpd drop-in, bump to 1.4.1

Proxmox Router hai 2 días
pai
achega
1f6c479828
Modificáronse 5 ficheiros con 31 adicións e 3 borrados
  1. 1 1
      VERSION
  2. BIN=BIN
      bin/debtik
  3. BIN=BIN
      bin/debtik-cli
  4. 15 2
      install.sh
  5. 15 0
      scripts/debtik-update

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

BIN=BIN
bin/debtik


BIN=BIN
bin/debtik-cli


+ 15 - 2
install.sh

@@ -29,8 +29,17 @@ echo "Building DebTik server for $(uname -m); the first build may take several m
 CGO_ENABLED=0 "$go_cmd" build -trimpath -ldflags "-X debtik/internal/api.BuildCommit=$commit" -o "$build/debtik" ./cmd/server
 echo "Building DebTik CLI..."
 CGO_ENABLED=0 "$go_cmd" build -trimpath -o "$build/debtik-cli" ./cmd/debtik-cli
-install -d -m 0700 /etc/debtik
-if [[ ! -e /etc/proxmox-router ]]; then ln -s /etc/debtik /etc/proxmox-router; fi
+# Migrate legacy /etc/proxmox-router config directory to /etc/debtik
+if [[ -d /etc/proxmox-router && ! -L /etc/proxmox-router ]]; then
+  install -d -m 0700 /etc/debtik
+  cp -a /etc/proxmox-router/* /etc/debtik/ 2>/dev/null || true
+  rm -rf /etc/proxmox-router
+  ln -s /etc/debtik /etc/proxmox-router
+fi
+if [[ ! -e /etc/proxmox-router ]]; then
+  install -d -m 0700 /etc/debtik
+  ln -s /etc/debtik /etc/proxmox-router
+fi
 install -d -m 0700 /var/lib/debtik/update
 install -d -m 0755 /usr/local/libexec
 install -m 0750 scripts/debtik-update /usr/local/libexec/debtik-update
@@ -46,6 +55,10 @@ done
 ln -sf /usr/local/bin/debtik /usr/local/bin/proxmox-router
 if [[ -f /etc/network/interfaces ]] && ! grep -Eq '^source[[:space:]]+/etc/network/interfaces\.d/\*' /etc/network/interfaces; then printf '\nsource /etc/network/interfaces.d/*\n' >> /etc/network/interfaces; fi
 install -m 0644 systemd/debtik.service /etc/systemd/system/debtik.service
+if [[ -f /etc/systemd/system/proxmox-router.service.d/mstpd.conf && ! -f /etc/systemd/system/debtik.service.d/mstpd.conf ]]; then
+  install -d -m 0755 /etc/systemd/system/debtik.service.d
+  cp /etc/systemd/system/proxmox-router.service.d/mstpd.conf /etc/systemd/system/debtik.service.d/mstpd.conf
+fi
 if systemctl is-active --quiet proxmox-router.service; then
   systemctl stop proxmox-router.service || true
   systemctl disable proxmox-router.service || true

+ 15 - 0
scripts/debtik-update

@@ -124,8 +124,23 @@ install -m 0750 scripts/install-dependencies.sh /usr/local/libexec/debtik-instal
 mv -f /usr/local/libexec/debtik-update.next /usr/local/libexec/debtik-update
 mv -f /usr/local/libexec/debtik-release-version.next /usr/local/libexec/debtik-release-version
 mv -f /usr/local/libexec/debtik-install-dependencies.next /usr/local/libexec/debtik-install-dependencies
+# Migrate legacy /etc/proxmox-router config directory to /etc/debtik
+if [[ -d /etc/proxmox-router && ! -L /etc/proxmox-router ]]; then
+  install -d -m 0700 /etc/debtik
+  cp -a /etc/proxmox-router/* /etc/debtik/ 2>/dev/null || true
+  rm -rf /etc/proxmox-router
+  ln -s /etc/debtik /etc/proxmox-router
+fi
+if [[ ! -e /etc/proxmox-router ]]; then
+  install -d -m 0700 /etc/debtik
+  ln -s /etc/debtik /etc/proxmox-router
+fi
 if [[ -f systemd/debtik.service ]]; then
   install -m 0644 systemd/debtik.service /etc/systemd/system/debtik.service
+  if [[ -f /etc/systemd/system/proxmox-router.service.d/mstpd.conf && ! -f /etc/systemd/system/debtik.service.d/mstpd.conf ]]; then
+    install -d -m 0755 /etc/systemd/system/debtik.service.d
+    cp /etc/systemd/system/proxmox-router.service.d/mstpd.conf /etc/systemd/system/debtik.service.d/mstpd.conf
+  fi
   systemctl daemon-reload
   systemctl enable debtik.service
 fi