From 9b94702a4dcf5d9175c1a5faab3aec62890ccffd Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 5 Mar 2021 17:48:27 +0300
Subject: [PATCH] remove caddy containers

---
 docker-compose.yml | 25 -------------------------
 web-ssl/Caddyfile  |  9 ---------
 web-ssl/Dockerfile |  4 ----
 web/Caddyfile      |  8 --------
 web/Dockerfile     |  3 ---
 5 files changed, 49 deletions(-)
 delete mode 100644 web-ssl/Caddyfile
 delete mode 100644 web-ssl/Dockerfile
 delete mode 100644 web/Caddyfile
 delete mode 100644 web/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index 266807e..2483c31 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,31 +52,6 @@ services:
       - app
     command: /opt/tt-rss/updater.sh
 
-#  web:
-#    build: ./web
-#    restart: unless-stopped
-#    ports:
-#      - ${HTTP_PORT}:2015
-#    volumes:
-#      - app:/var/www/html:ro
-#    depends_on:
-#      - app
-
-#  web-ssl:
-#    build: ./web-ssl
-#    restart: unless-stopped
-#    environment:
-#      - CADDYPATH=/certs
-#      - HTTP_HOST=${HTTP_HOST}
-#    ports:
-#      - 80:80
-#      - 443:443
-#    volumes:
-#      - app:/var/www/html:ro
-#      - certs:/certs
-#    depends_on:
-#      - app
-
   web-nginx:
     build: ./web-nginx
     restart: unless-stopped
diff --git a/web-ssl/Caddyfile b/web-ssl/Caddyfile
deleted file mode 100644
index 076829c..0000000
--- a/web-ssl/Caddyfile
+++ /dev/null
@@ -1,9 +0,0 @@
-{%HTTP_HOST%}
-tls ttrss@{%HTTP_HOST%}
-
-root /var/www/html
-log stdout
-errors stderr
-internal /tt-rss/cache
-internal /tt-rss/backups
-fastcgi / app:9000 php
diff --git a/web-ssl/Dockerfile b/web-ssl/Dockerfile
deleted file mode 100644
index 458a259..0000000
--- a/web-ssl/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM abiosoft/caddy:no-stats
-
-COPY Caddyfile /etc/
-ENV ACME_AGREE=true
\ No newline at end of file
diff --git a/web/Caddyfile b/web/Caddyfile
deleted file mode 100644
index 663227c..0000000
--- a/web/Caddyfile
+++ /dev/null
@@ -1,8 +0,0 @@
-0.0.0.0
-root /var/www/html
-log stdout
-errors stderr
-internal /tt-rss/cache
-internal /tt-rss/backups
-fastcgi / app:9000 php
-
diff --git a/web/Dockerfile b/web/Dockerfile
deleted file mode 100644
index 4d081e8..0000000
--- a/web/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM abiosoft/caddy:no-stats
-
-COPY Caddyfile /etc/