putting this branch to bed (#5)

* added some important stuff * removed placeholder Caddyfile * updated README * working again 👍 * Add logging storage (#2) (#3) * added some important stuff * removed placeholder Caddyfile * updated README Co-authored-by: SamEureka <[email protected]> Co-authored-by: SamEureka <[email protected]> * git merge funk... 💣 Co-authored-by: SamEureka <[email protected]>
SamEureka · Sep 6, 2022 · 29e5756 · 29e5756
1 parent c45dc0b
commit 29e5756
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.formatting.provider": "yapf"
+}
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
-# <img src="caddy-dumb.png" alt="crappy caddy logo" width="60" /> balenaCaddyReverser
+# <img src="caddy-dumb.png" alt="crappy caddy logo" width="60" /> caddy-reverso
 
-__balenaCaddyReverser__ is a Caddy based reverse-proxy server running on your Raspberry Pi! It implements ACME DNS Challenge to obtain tls certificates from Let's Encrypt and is configured via balena device variables in the cloud dashboard. Tested on all Raspberry Pi from v1 to Pi-4-64!
+__caddy-reverso__ is a Caddy based reverse-proxy server running on your Raspberry Pi! It implements ACME DNS Challenge to obtain tls certificates from Let's Encrypt and is configured via balena device variables in the cloud dashboard. Tested on all Raspberry Pi from v1 to Pi-4-64!
 
 ## Status
-* ~~Works!!!~~ I broke some stuff... working on it.
+* Works!!! ~~I broke some stuff... working on it.~~
 * Needs to be documented properly
 * Uses device variables to config the Caddyfile
 * Wildcard certificates are working!!
@@ -14,6 +14,8 @@ __balenaCaddyReverser__ is a Caddy based reverse-proxy server running on your Ra
 1. Document
 2. Figure out how to publish as an app on [Balena Hub](https://hub.balena.io)
 3. Test other DNS providers for the ACME provisioning
+4. OAUTH authentication integration ([module](https://github.com/greenpau/caddy-security))
+5. Basic authentication integration (should be easy :laughing:)
 
 ## Device Variables
 |Name|Value|Notes|

diff --git a/caddy/caddy-config.py b/caddy/caddy-config.py
@@ -133,11 +133,7 @@ def write_caddyfile():
 ## Start the caddy server passing in our new config file.
 ## If there aren't any HOSTs... don't start Caddy
 if (create_env_list() != []):
-    subprocess.run(['caddy', 'run', '--config', '/etc/caddy/Caddyfile', '--adapter caddyfile'], capture_output=True)
+    os.system('caddy run --config /etc/caddy/Caddyfile --adapter caddyfile')
 
-
-## ^^^^ trying `caddy run` instead of `caddy start` 
-
-## Idle... I couldn't find a better way to keep the service running.
-## Please put in an issue if you know a better way to do this... or better yet, a PR!
-#os.system('balena-idle')
+## Idle... I like balena-idle as a fallback for troubleshooting. You can comment this out if you like.
+os.system('balena-idle')