Enforcing static volume names for each stack

12 files changed, 28 insertions, 17 deletions

diff --git a/stacks/cgit/.env.template b/stacks/cgit/.env.template
index d96cdc5..94ec0ed 100644
--- a/stacks/cgit/.env.template
+++ b/stacks/cgit/.env.template
@@ -3,13 +3,14 @@
 # Stack Compose Variables
 
 # Namespace
-_STACK=cgit-test
-_CONTAINER=cgit-test
+_STACK=
+_CONTAINER=
 
 # Network
-_NET=test
+_NET=
 
 # Volumes
+# TODO: Make these cgit-docker builtins.
 _CSS_FILE=
 _CONFIG_FILE=
 _GIT_ROOT=
diff --git a/stacks/cgit/.gitignore b/stacks/cgit/.gitignore
index 1c1138e..9cc0f59 100644
--- a/stacks/cgit/.gitignore
+++ b/stacks/cgit/.gitignore
@@ -2,5 +2,8 @@
 *.env
 srv/
 srv/*
-config/
-config/*
+opt/
+opt/*
+etc/
+etc/*
+compose.local.yml
diff --git a/stacks/cgit/compose.yml b/stacks/cgit/compose.yml
index da4e144..e3c7ab1 100644
--- a/stacks/cgit/compose.yml
+++ b/stacks/cgit/compose.yml
@@ -17,7 +17,10 @@ services:
     expose:
       - 80
     volumes:
-      # TODO: Create env overrides in docker-cgit for css/config file locations as well as the git root.
-      - ${_CSS_FILE:-./config/cgit.css}:/srv/www/htdocs/cgit/cgit.css
-      - ${_CONFIG_FILE:-./config/cgitrc}:/etc/cgitrc
+      # TODO: Make these cgit-docker builtins.
+      - ${_CSS_FILE:-./opt/cgit.css}:/srv/www/htdocs/cgit/cgit.css
+      - ${_SITE_HEADER:-./opt/header.html}:/opt/header.html
+      - ${_SITE_FOOTER:-./opt/footer.html}:/opt/footer.html
+      - ${_ROOT_README:-./opt/README.txt}:/opt/README.txt
+      - ${_CONFIG_FILE:-./etc/cgitrc}:/etc/cgitrc
       - ${_GIT_ROOT:-./srv/git/}:/srv/git # mount the directory you use for your git server
diff --git a/stacks/codex/.gitignore b/stacks/codex/.gitignore
index b31db7b..8507661 100644
--- a/stacks/codex/.gitignore
+++ b/stacks/codex/.gitignore
@@ -1,3 +1,4 @@
 *.env
 space/
 space/**
+compose.local.yml
diff --git a/stacks/codex/compose.yml b/stacks/codex/compose.yml
index 8e17e82..d144cb4 100644
--- a/stacks/codex/compose.yml
+++ b/stacks/codex/compose.yml
@@ -23,4 +23,4 @@ services:
     expose:
       - 3000
     volumes:
-      - ${data:-./space/}:/space
+      - data:/space
diff --git a/stacks/dav/.gitignore b/stacks/dav/.gitignore
index dff03c1..375a3dd 100644
--- a/stacks/dav/.gitignore
+++ b/stacks/dav/.gitignore
@@ -2,3 +2,4 @@
 *.env
 .database/
 .database/**
+compose.local.yml
diff --git a/stacks/dav/compose.yml b/stacks/dav/compose.yml
index 7e59600..fdc5b23 100644
--- a/stacks/dav/compose.yml
+++ b/stacks/dav/compose.yml
@@ -22,7 +22,7 @@ services:
       - .davis.env
       - .db.env
     volumes:
-      - ${data:-.database/}:/var/lib/postgresql/data
+      - data:/var/lib/postgresql/data
 
   davis:
     container_name: ${_CONTAINER}
diff --git a/stacks/edge/.gitignore b/stacks/edge/.gitignore
index 077b892..a63593e 100644
--- a/stacks/edge/.gitignore
+++ b/stacks/edge/.gitignore
@@ -4,3 +4,4 @@
 .data/
 .config/
 Caddyfile
+compose.local.yml
diff --git a/stacks/edge/Caddyfile.template b/stacks/edge/Caddyfile.template
index 23a6498..85ca962 100644
--- a/stacks/edge/Caddyfile.template
+++ b/stacks/edge/Caddyfile.template
@@ -12,18 +12,18 @@
   file_server
 }
 
-{$SERVICE0_SUB}.{$DOMAIN}:80 {
+{$SERVICE0_SUB}.{$DOMAIN} {
   reverse_proxy {$SERVICE0}:{$SERVICE0_PORT}
 }
 
-{$SERVICE1_SUB}.{$DOMAIN}:80 {
+{$SERVICE1_SUB}.{$DOMAIN} {
   reverse_proxy {$SERVICE1}:{$SERVICE1_PORT}
 }
 
-{$SERVICE2_SUB}.{$DOMAIN}:80 {
+{$SERVICE2_SUB}.{$DOMAIN} {
   reverse_proxy {$SERVICE2}:{$SERVICE2_PORT}
 }
 
-{$SERVICE3_SUB}.{$DOMAIN}:80 {
+{$SERVICE3_SUB}.{$DOMAIN} {
   reverse_proxy {$SERVICE3}:{$SERVICE3_PORT}
 }
diff --git a/stacks/edge/compose.yml b/stacks/edge/compose.yml
index 1fc33a7..75baf0d 100644
--- a/stacks/edge/compose.yml
+++ b/stacks/edge/compose.yml
@@ -30,5 +30,5 @@ services:
     volumes:
       - ${_CADDYFILE:-./Caddyfile}:/etc/caddy/Caddyfile
       - ${_WEBROOT:-.srv/}:/srv
-      - ${data:-.data/}:/data
-      - ${config:-.config/}:/config
+      - data:/data
+      - config:/config
diff --git a/stacks/tss/.gitignore b/stacks/tss/.gitignore
index 091dacc..c71102c 100644
--- a/stacks/tss/.gitignore
+++ b/stacks/tss/.gitignore
@@ -1,3 +1,4 @@
 *.env
 .data/
 .data/**
+compose.local.yml
diff --git a/stacks/tss/compose.yml b/stacks/tss/compose.yml
index 8e086e8..cab2a13 100644
--- a/stacks/tss/compose.yml
+++ b/stacks/tss/compose.yml
@@ -19,7 +19,7 @@ services:
       - .tss.env
       - .env
     volumes:
-      - ${data:-.data/}:/var/lib/taskchampion-sync-server/data
+      - data:/var/lib/taskchampion-sync-server/data
     networks:
       - net
     expose: