use new s6-rc layout [skip ci]

2022-02-16 08:50:40 +01:00 · 2022-02-16 08:50:40 +01:00 · a4c316a485
commit a4c316a485
parent 92cb6aa224
11 changed files with 9 additions and 34 deletions
--- a/rootfs/etc/cont-init.d/synapse-keys
+++ b/rootfs/etc/cont-init.d/synapse-keys
@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-if [ ! -f /var/lib/matrix-synapse/signing/signing.key ]; then
-    s6-setuidgid matrix-synapse python3 -B -m synapse.app.homeserver -c /var/lib/matrix-synapse/server.yaml --generate-config -H $SERVER_NAME --report-stats=no
-fi
--- a/rootfs/etc/s6-overlay/s6-rc.d/matrix-synapse/dependencies
+++ b/rootfs/etc/s6-overlay/s6-rc.d/matrix-synapse/dependencies
@ -0,0 +1,2 @@
+confd
+synapse-keys
--- a/rootfs/etc/s6-overlay/s6-rc.d/matrix-synapse/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/matrix-synapse/run
@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh

 cd /var/lib/matrix-synapse
 s6-setuidgid matrix-synapse python3 -B -m synapse.app.homeserver -c server.yaml
--- a/rootfs/etc/s6-overlay/s6-rc.d/matrix-synapse/type
+++ b/rootfs/etc/s6-overlay/s6-rc.d/matrix-synapse/type
@ -0,0 +1 @@
+longrun
--- a/rootfs/etc/s6-overlay/s6-rc.d/synapse-keys/dependencies
+++ b/rootfs/etc/s6-overlay/s6-rc.d/synapse-keys/dependencies
@ -0,0 +1 @@
+confd
--- a/rootfs/etc/s6-overlay/s6-rc.d/synapse-keys/type
+++ b/rootfs/etc/s6-overlay/s6-rc.d/synapse-keys/type
@ -0,0 +1 @@
+oneshot
--- a/rootfs/etc/s6-overlay/s6-rc.d/synapse-keys/up
+++ b/rootfs/etc/s6-overlay/s6-rc.d/synapse-keys/up
@ -0,0 +1 @@
+synapse-keys
--- a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/matrix-synapse
+++ b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/matrix-synapse