From 3fbb3f61d5d16391a05df371a2f29576b2626c65 Mon Sep 17 00:00:00 2001
From: traveler <phil@pncharris.com>
Date: Sun, 16 Feb 2025 15:05:09 -0600
Subject: [PATCH] sad

---
 wordpress-classifieds.yaml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/wordpress-classifieds.yaml b/wordpress-classifieds.yaml
index 1d8f866..3c97147 100644
--- a/wordpress-classifieds.yaml
+++ b/wordpress-classifieds.yaml
@@ -60,16 +60,12 @@ services:
       WORDPRESS_DB_USER: traveler
       WORDPRESS_DB_PASSWORD: F@lcon13
       WORDPRESS_DB_NAME: wp
-      # Added SSL configurations
+      # Fixed SSL configurations
       WORDPRESS_CONFIG_EXTRA: |
+        $_SERVER['HTTPS'] = isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' ? 'on' : 'off';
         define('FORCE_SSL_ADMIN', true);
         define('WP_HOME', 'https://classifieds.pncfishandmore.com');
         define('WP_SITEURL', 'https://classifieds.pncfishandmore.com');
-        
-        # Handle SSL reverse proxy
-        if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
-            $_SERVER['HTTPS'] = 'on';
-        }
     volumes:
       - /data/nfs/Baxter/Docker/wp-pnc/wp:/var/www/html
     networks:
@@ -84,7 +80,7 @@ services:
         - kuma.wp.http.name="classified"
         - kuma.wallos.http.url=http://wordpress:80
         - caddy=classifieds.pncfishandmore.com
-        # - caddy.import=authentik
+        - caddy.import=authentik
         - caddy.reverse_proxy="{{upstreams 80}}"
         # Added Caddy headers for SSL
         - "caddy.header=Strict-Transport-Security \"max-age=31536000; includeSubDomains\""
@@ -92,10 +88,6 @@ services:
         - "caddy.header=X-Real-IP {http.request.remote.host}"
         - "caddy.header=X-Forwarded-For {http.request.remote.host}"
         - "caddy.header=Host {http.request.host}"
-      placement:
-          constraints:
-            - node.labels.general == true
-        
 
   wpdb:
     image: mysql:8.0
@@ -109,10 +101,6 @@ services:
       - /data/nfs/Baxter/Docker/wp-pnc/sql:/var/lib/mysql
     networks:
       - netgrimoire
-    deploy:
-      placement:
-        constraints:
-          - node.labels.general == true
 
 volumes:
   wordpress: