From 8714f106eea3c6d87f14e24c360d1d00de2e2ed1 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Mon, 14 Feb 2022 12:36:22 +0100
Subject: [PATCH] use s6-rc format

---
 .editorconfig                                | 9 ---------
 rootfs/etc/s6-rc.d/nginx/dependencies        | 2 ++
 rootfs/etc/{services.d => s6-rc.d}/nginx/run | 2 +-
 rootfs/etc/s6-rc.d/nginx/type                | 1 +
 rootfs/etc/s6-rc.d/user/contents.d/nginx     | 0
 5 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 .editorconfig
 create mode 100644 rootfs/etc/s6-rc.d/nginx/dependencies
 rename rootfs/etc/{services.d => s6-rc.d}/nginx/run (51%)
 create mode 100644 rootfs/etc/s6-rc.d/nginx/type
 create mode 100644 rootfs/etc/s6-rc.d/user/contents.d/nginx

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index d741e40..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,9 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
diff --git a/rootfs/etc/s6-rc.d/nginx/dependencies b/rootfs/etc/s6-rc.d/nginx/dependencies
new file mode 100644
index 0000000..9c314f3
--- /dev/null
+++ b/rootfs/etc/s6-rc.d/nginx/dependencies
@@ -0,0 +1,2 @@
+confd
+nextcloud-config
diff --git a/rootfs/etc/services.d/nginx/run b/rootfs/etc/s6-rc.d/nginx/run
similarity index 51%
rename from rootfs/etc/services.d/nginx/run
rename to rootfs/etc/s6-rc.d/nginx/run
index 807d20a..e33de41 100644
--- a/rootfs/etc/services.d/nginx/run
+++ b/rootfs/etc/s6-rc.d/nginx/run
@@ -1,3 +1,3 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh
 
 exec nginx -g "daemon off;"
diff --git a/rootfs/etc/s6-rc.d/nginx/type b/rootfs/etc/s6-rc.d/nginx/type
new file mode 100644
index 0000000..5883cff
--- /dev/null
+++ b/rootfs/etc/s6-rc.d/nginx/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-rc.d/user/contents.d/nginx b/rootfs/etc/s6-rc.d/user/contents.d/nginx
new file mode 100644
index 0000000..e69de29