From 91de9d05acbee638786066918123dde8963a7d48 Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <kris@lamoureux.io>
Date: Tue, 5 Dec 2023 21:55:52 -0500
Subject: [PATCH] testing

---
 dev/dockerbox.yml           | 10 +++----
 dev/host_vars/dockerbox.yml | 56 ++++++++++++++++++++++++++-----------
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/dev/dockerbox.yml b/dev/dockerbox.yml
index 48927c4..04bd113 100644
--- a/dev/dockerbox.yml
+++ b/dev/dockerbox.yml
@@ -5,9 +5,9 @@
     - host_vars/dockerbox.yml
   roles:
     - base
+    - proxy
     - docker
-    - traefik
-    - nextcloud
-    - jenkins
-    - prometheus
-    - nginx
+    # - nextcloud
+    # - jenkins
+    # - prometheus
+    # - nginx
diff --git a/dev/host_vars/dockerbox.yml b/dev/host_vars/dockerbox.yml
index 95e8545..97d47bc 100644
--- a/dev/host_vars/dockerbox.yml
+++ b/dev/host_vars/dockerbox.yml
@@ -2,29 +2,53 @@
 allow_reboot: false
 manage_network: false
 
+# Import my GPG key for git signature verification
+root_gpgkeys:
+  - name: kris@lamoureux.io
+    id: FBF673CEEC030F8AECA814E73EDA9C3441EDA925
+
+# proxy
+proxy:
+  servers:
+    - domain: traefik.local.krislamo.org
+      proxy_pass: https://127.0.0.1:8443
+    - domain: cloud.local.krislamo.org
+      proxy_pass: http://127.0.0.1:8000
+
 # docker
+docker_official: true # docker's apt repos
 docker_users:
   - vagrant
 
-# traefik
-traefik_version: latest
-traefik_dashboard: true
-traefik_domain: traefik.local.krislamo.org
-traefik_auth: admin:$apr1$T1l.BCFz$Jyg8msXYEAUi3LLH39I9d1 # admin:admin
-traefik_web_entry: 0.0.0.0:80
-traefik_websecure_entry: 0.0.0.0:443
-#traefik_acme_email: realemail@example.com # Let's Encrypt settings
-#traefik_production: true
-#traefik_http_only: true # if behind reverse-proxy
+docker_compose_env_nolog: false # dev only setting
+docker_compose_deploy:
+  # Traefik
+  - name: traefik
+    url: https://github.com/krislamo/traefik
+    version: e03268af4cf942c47cba66c2112628dbcad1b756
+    path: docker-compose.web.yml
+    enabled: true
+    accept_newhostkey: true
+    trusted_keys:
+      - FBF673CEEC030F8AECA814E73EDA9C3441EDA925
+    env:
+      ENABLE: true
+  # Nextcloud
+  - name: nextcloud
+    url: https://git.krislamo.org/kris/nextcloud
+    version: a2e38cec703839211e11dc8347b4cdd62fa6f24d
+    enabled: true
+    env:
+      DATA: ./data
 
 # nextcloud
-nextcloud_version: stable
-nextcloud_admin: admin
-nextcloud_pass: password
-nextcloud_domain: cloud.local.krislamo.org
+#nextcloud_version: stable
+#nextcloud_admin: admin
+#nextcloud_pass: password
+#nextcloud_domain: cloud.local.krislamo.org
 
-nextcloud_dbversion: latest
-nextcloud_dbpass: password
+#nextcloud_dbversion: latest
+#nextcloud_dbpass: password
 
 # jenkins
 jenkins_version: lts