From 4ee67c9bc5c2acc2835773b39de1253debc7f89a Mon Sep 17 00:00:00 2001
From: Spunkie <github@spunkiedesign.com>
Date: Thu, 27 May 2021 11:57:01 -0600
Subject: [PATCH] universal: cloudflared add s6 service, README.md tweaks

---
 README.md                           | 11 ++---------
 root/etc/services.d/cloudflared/run |  3 +++
 2 files changed, 5 insertions(+), 9 deletions(-)
 create mode 100644 root/etc/services.d/cloudflared/run

diff --git a/README.md b/README.md
index 5fccad6..0dd572b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 In docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:universal-cloudflared`
 
-If no additional parameters are supplied this mod builds `cloudflared` from [source](https://github.com/cloudflare/cloudflared) using the [latest release tag](https://github.com/cloudflare/cloudflared/releases/latest) and adds it to [any LSIO docker image](https://fleet.linuxserver.io/).
+If no additional parameters are supplied this mod adds [`cloudflared`](https://github.com/cloudflare/cloudflared) using the [latest release tag](https://github.com/cloudflare/cloudflared/releases/latest) to any [LSIO docker image](https://fleet.linuxserver.io/), to be installed/updated during container start.
 
 If all additional parameters are supplied this docker mod will also create/configure/route/enable a cloudflare tunnel via `cloudflared` and the cloudflare v4 API.
 
@@ -23,7 +23,7 @@ Here an example snippet to help you get started using this docker mod.
       PGID: 1000
       TZ: Europe/London
       URL: yourdomain.url
-      SUBDOMAINS: test,gitlab,gitlab-ssh,
+      SUBDOMAINS: test,
       VALIDATION: dns
       DNSPLUGIN: cloudflare #optional
       ONLY_SUBDOMAINS: true #optional
@@ -40,16 +40,9 @@ Here an example snippet to help you get started using this docker mod.
         ingress:
           - hostname: test.yourdomain.url
             service: hello_world
-          - hostname: gitlab.yourdomain.url
-            service: https://localhost:443
-          - hostname: gitlab-ssh.yourdomain.url
-            service: ssh://localhost:22
           - service: http_status:404
     volumes:
       - /path/to/appdata/config:/config
-    ports:
-      - 443:443
-      # - 80:80 #optional
     restart: unless-stopped
 ```
 
diff --git a/root/etc/services.d/cloudflared/run b/root/etc/services.d/cloudflared/run
new file mode 100644
index 0000000..b1813de
--- /dev/null
+++ b/root/etc/services.d/cloudflared/run
@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+exec s6-setuidgid abc cloudflared tunnel --no-autoupdate --config /etc/cloudflared/config.yml run
\ No newline at end of file