use new s6-rc layout

2022-02-15 17:21:46 +01:00 · 2022-02-15 17:21:46 +01:00 · 9160d81961
commit 9160d81961
parent 44f4af8349
11 changed files with 21 additions and 23 deletions
--- a/rootfs/etc/fix-attrs.d/01-redis
+++ b/rootfs/etc/fix-attrs.d/01-redis
@ -1 +0,0 @@
-/var/lib/redis/ true redis 0640 0750
--- a/rootfs/etc/s6-overlay/s6-rc.d/koreader-sync/dependencies
+++ b/rootfs/etc/s6-overlay/s6-rc.d/koreader-sync/dependencies
@ -0,0 +1 @@
+confd
--- a/rootfs/etc/s6-overlay/s6-rc.d/koreader-sync/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/koreader-sync/run
@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh

 cd /app/server
 s6-setuidgid syncer gin start
--- a/rootfs/etc/s6-overlay/s6-rc.d/koreader-sync/type
+++ b/rootfs/etc/s6-overlay/s6-rc.d/koreader-sync/type
@ -0,0 +1 @@
+longrun
--- a/rootfs/etc/s6-overlay/s6-rc.d/redis/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/redis/run
@ -1,3 +1,3 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh

 exec s6-setuidgid redis redis-server /etc/redis.conf
--- a/rootfs/etc/s6-overlay/s6-rc.d/redis/type
+++ b/rootfs/etc/s6-overlay/s6-rc.d/redis/type
@ -0,0 +1 @@
+longrun
--- a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/koreader-sync
+++ b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/koreader-sync
--- a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/redis
+++ b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/redis