diff --git a/conffiles.dist b/conffiles.dist index 3467ac9..799eff9 100644 --- a/conffiles.dist +++ b/conffiles.dist @@ -1,2 +1 @@ -/etc/@@PACKAGEDIR@@/Rocket.toml /etc/@@PACKAGEDIR@@/config.env diff --git a/patch/amd64/Dockerfile.patch b/patch/amd64/Dockerfile.patch index f50ac16..554f72e 100644 --- a/patch/amd64/Dockerfile.patch +++ b/patch/amd64/Dockerfile.patch @@ -1,6 +1,6 @@ --- git/docker/amd64/Dockerfile 2021-02-12 11:45:13.762372371 +0100 +++ Dockerfile 2021-02-12 11:59:56.727518522 +0100 -@@ -111,3 +111,24 @@ +@@ -111,3 +111,23 @@ WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] CMD ["/start.sh"] @@ -18,7 +18,6 @@ +COPY debian/control /vaultwarden_package/DEBIAN/control +COPY debian/postinst /vaultwarden_package/DEBIAN/postinst +COPY debian/conffiles /vaultwarden_package/DEBIAN/conffiles -+COPY Rocket.toml /vaultwarden_package/etc/@@PACKAGEDIR@@ +COPY debian/config.env /vaultwarden_package/etc/@@PACKAGEDIR@@ +COPY debian/@@EXECUTABLENAME@@.service /vaultwarden_package/usr/lib/systemd/system +COPY --from=vault /web-vault /vaultwarden_package/usr/share/@@PACKAGEDIR@@/web-vault diff --git a/patch/armv7/Dockerfile.patch b/patch/armv7/Dockerfile.patch index 0c69238..350b7d6 100644 --- a/patch/armv7/Dockerfile.patch +++ b/patch/armv7/Dockerfile.patch @@ -1,6 +1,6 @@ --- git/docker/armv7/Dockerfile 2021-02-12 11:45:13.763372371 +0100 +++ Dockerfile 2021-02-12 12:25:50.078877369 +0100 -@@ -157,3 +157,24 @@ +@@ -157,3 +157,23 @@ WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] CMD ["/start.sh"] @@ -18,7 +18,6 @@ +COPY debian/control /vaultwarden_package/DEBIAN/control +COPY debian/postinst /vaultwarden_package/DEBIAN/postinst +COPY debian/conffiles /vaultwarden_package/DEBIAN/conffiles -+COPY Rocket.toml /vaultwarden_package/etc/@@PACKAGEDIR@@ +COPY debian/config.env /vaultwarden_package/etc/@@PACKAGEDIR@@ +COPY debian/@@EXECUTABLENAME@@.service /vaultwarden_package/usr/lib/systemd/system +COPY --from=vault /web-vault /vaultwarden_package/usr/share/@@PACKAGEDIR@@/web-vault diff --git a/postinst.dist b/postinst.dist index 596a775..69f29c1 100755 --- a/postinst.dist +++ b/postinst.dist @@ -2,4 +2,3 @@ DIR_MODE=0700 adduser --system --group --home /var/lib/@@PACKAGEDIR@@ @@SERVICEUSER@@ chmod 700 /var/lib/@@PACKAGEDIR@@ chmod 600 /etc/@@PACKAGEDIR@@/config.env -chmod 600 /etc/@@PACKAGEDIR@@/Rocket.toml