From 95e229d3ce77c33b3f9f3557d2e8620c4e978ab2 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Fri, 23 Jun 2023 20:40:48 -0400 Subject: [PATCH] Fix issues with .deb /etc symlink --- build/package/deb/MakeInstall | 7 +++---- build/package/deb/debian/links | 1 + build/package/deb/debian/postinst | 4 ++++ tgstation-server.sln | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 build/package/deb/debian/links diff --git a/build/package/deb/MakeInstall b/build/package/deb/MakeInstall index 5fad7c1b85..083f9c04d1 100755 --- a/build/package/deb/MakeInstall +++ b/build/package/deb/MakeInstall @@ -2,7 +2,6 @@ install: build/package/deb/install_artifacts.sh "$(DESTDIR)" - install -D build/package/deb/appsettings.Initial.yml "$(DESTDIR)/etc/tgstation-server/appsettings.Production.yml" - ln -s "$(DESTDIR)/etc/tgstation-server/appsettings.Production.yml" "$(DESTDIR)/opt/tgstation-server/appsettings.Production.yml" - install -d "$(DESTDIR)/usr/bin" - install -D build/package/deb/tgs-configure "$(DESTDIR)/usr/bin/" + install -D build/package/deb/appsettings.Initial.yml "$(DESTDIR)/etc/tgstation-server/appsettings.Initial.yml" + install src/Tgstation.Server.Host/appsettings.yml "$(DESTDIR)/etc/tgstation-server/appsettings.ex.yml" + install -D build/package/deb/tgs-configure "$(DESTDIR)/usr/bin/tgs-configure" diff --git a/build/package/deb/debian/links b/build/package/deb/debian/links new file mode 100644 index 0000000000..8a960e0a76 --- /dev/null +++ b/build/package/deb/debian/links @@ -0,0 +1 @@ +/etc/tgstation-server/appsettings.Production.yml /opt/tgstation-server/appsettings.Production.yml diff --git a/build/package/deb/debian/postinst b/build/package/deb/debian/postinst index 59b7e74996..f6fa53b4a8 100755 --- a/build/package/deb/debian/postinst +++ b/build/package/deb/debian/postinst @@ -1,6 +1,10 @@ #!/bin/sh -e if [ "$1" = "configure" ]; then + # Copy appsettings.Initial.yml to .Production to make the symlink work + cp /etc/tgstation-server/appsettings.Initial.yml /etc/tgstation-server/appsettings.Production.yml + chown 600 /etc/tgstation-server/appsettings.Production.yml + # disable first time startup so user can configure deb-systemd-helper mask 'tgstation-server.service' >/dev/null || true fi diff --git a/tgstation-server.sln b/tgstation-server.sln index fb73c96e35..8c700d5f29 100644 --- a/tgstation-server.sln +++ b/tgstation-server.sln @@ -216,6 +216,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "debian", "debian", "{08E7C6 build\package\deb\debian\changelog = build\package\deb\debian\changelog build\package\deb\debian\control = build\package\deb\debian\control build\package\deb\debian\copyright = build\package\deb\debian\copyright + build\package\deb\debian\links = build\package\deb\debian\links build\package\deb\debian\postinst = build\package\deb\debian\postinst build\package\deb\debian\prerm = build\package\deb\debian\prerm build\package\deb\debian\rules = build\package\deb\debian\rules