From 51d183a860c35bfa21f9a00ce3c9c864b8b4a669 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Mon, 26 Oct 2020 22:15:35 +0200
Subject: [PATCH] =?UTF-8?q?Working=20pelican=20config=20=F0=9F=90=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 compose.yml | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/compose.yml b/compose.yml
index 662a96c..c3a570f 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,9 +3,23 @@ version: "3.8"
 
 services:
   app:
-    image: nginx:1.19.2
+    image: 3wordchant/pelican:4.2.0
+    volumes:
+      - src:/site
+      - output:/site-generated
+
+  web:
+    image: httpd:2.4
+    volumes:
+      - output:/usr/local/apache2/htdocs/:ro
     networks:
       - proxy
+    command: >
+      bash -c
+        "
+        sed -i '/LoadModule rewrite_module/s/^#//g' /usr/local/apache2/conf/httpd.conf &&
+        sed -i 's#AllowOverride [Nn]one#AllowOverride All#' /usr/local/apache2/conf/httpd.conf &&
+        httpd -DFOREGROUND"
     deploy:
       restart_policy:
         condition: on-failure
@@ -15,16 +29,14 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        ## Redirect from EXTRA_DOMAINS to DOMAIN
-        #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 1m
+        # Redirect from EXTRA_DOMAINS to DOMAIN
+        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
+
+volumes:
+  src:
+  output:
 
 networks:
   proxy: