diff options
author | gesang <gesang@itinerariummentis.org> | 2024-07-15 08:50:18 +0000 |
---|---|---|
committer | gesang <gesang@itinerariummentis.org> | 2024-07-15 08:50:18 +0000 |
commit | d1209e6c239a8787cac52a3a33edb275aa4ab7cb (patch) | |
tree | f81c98108838267efdf601da65b58f0f94001b74 /docker-compose.yaml | |
parent | cd8115bb1a79fcbb8853e3c5130d090b42fa3941 (diff) |
Fix merge issue
Diffstat (limited to 'docker-compose.yaml')
-rw-r--r-- | docker-compose.yaml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/docker-compose.yaml b/docker-compose.yaml index 845c69b..8c2d7c7 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,17 +6,11 @@ services: image: luuul/4get:latest restart: unless-stopped environment: -<<<<<<< HEAD - FOURGET_VERSION=6 - FOURGET_SERVER_NAME=4get.itinerariummentis.org -======= - - FOURGET_SERVER_NAME=4get.ca ->>>>>>> 0b68d6b2a9928d1b9dae389fbf5b95056e678be0 - ports: - "80:80" - "443:443" - volumes: - /etc/letsencrypt/live/domain.tld:/etc/4get/certs # mount custom banners and captcha |