summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--stacks/edge/.env.template2
-rw-r--r--stacks/edge/.gitignore4
-rw-r--r--stacks/edge/compose.yml28
3 files changed, 10 insertions, 24 deletions
diff --git a/stacks/edge/.env.template b/stacks/edge/.env.template
index 972ca33..0dc0292 100644
--- a/stacks/edge/.env.template
+++ b/stacks/edge/.env.template
@@ -11,6 +11,4 @@ _NET=
# Volumes
_CADDYFILE=
-_DATA_VOLUME=
-_CONFIG_VOLUME=
_WEBROOT=
diff --git a/stacks/edge/.gitignore b/stacks/edge/.gitignore
index a63593e..4d2bac6 100644
--- a/stacks/edge/.gitignore
+++ b/stacks/edge/.gitignore
@@ -1,7 +1,5 @@
# Ignore .env files
*.env
.srv/
-.data/
-.config/
Caddyfile
-compose.local.yml
+compose.test.yml
diff --git a/stacks/edge/compose.yml b/stacks/edge/compose.yml
index a1e71f4..7e88c95 100644
--- a/stacks/edge/compose.yml
+++ b/stacks/edge/compose.yml
@@ -1,30 +1,22 @@
-name: ${_STACK}
-
-volumes:
- data:
- name: ${_DATA_VOLUME}
- external: true
- config:
- name: ${_CONFIG_VOLUME}
- external: true
+name: ${_STACK_0}
networks:
- net:
- name: ${_NET}
+ edge-net:
+ name: ${_NET_0}
external: true
services:
- srv:
- container_name: ${_CONTAINER}
+ edge:
+ container_name: ${_CONTAINER_0}
image: caddy:latest
restart: unless-stopped
env_file:
- - .edge.env
+ - .run.env
- .env
networks:
- - net
+ - edge-net
cap_add:
- - NET_ADMIN # Allow Caddy to redefine memory limits based on host.
+ - NET_ADMIN # Allow Caddy to redefine memory limits based on host spec.
ports:
- 80:80
- 443:443
@@ -32,6 +24,4 @@ services:
volumes:
- ${_CADDYFILE:-./Caddyfile}:/etc/caddy/Caddyfile
- ${_WEBROOT:-.srv/}:/srv
- - data:/data
- - config:/config
- - /var/log/http/:/var/log/http # Bind for f2b.
+ - /var/log/http/:/var/log/http # Fail2Ban needs this.