weq

green.yaml

@@ -115,40 +115,40 @@ services:
   #       constraints:
   #         - node.hostname == nas
 
-  namer:
+  # namer:   # Note run on NAS in compose
-    container_name: namer
+  #   container_name: namer
-    image: ghcr.io/theporndatabase/namer:latest
+  #   image: ghcr.io/theporndatabase/namer:latest
-    networks:
+  #   networks:
-      - netgrimoire
+  #     - netgrimoire
-    environment:
+  #   environment:
-      - PUID=1001
+  #     - PUID=1001
-      - PGID=998
+  #     - PGID=998
-      - TZ=America/Chicago
+  #     - TZ=America/Chicago
-      - NAMER_CONFIG=/config/namer.cfg
+  #     - NAMER_CONFIG=/config/namer.cfg
-    volumes:
+  #   volumes:
-      - /DockerVol/namer/:/config 
+  #     - /DockerVol/namer/:/config 
-      - /data/nfs/Baxter/Green/:/data 
+  #     - /data/nfs/Baxter/Green/:/data 
-    ports:
+  #   ports:
-      - 6980:6980
+  #     - 6980:6980
-    restart: always
+  #   restart: always
-    healthcheck: # <- if on a qnap nas, the default health check will not work for you, domain name is the container_name
+  #   healthcheck: # <- if on a qnap nas, the default health check will not work for you, domain name is the container_name
-      test: [ "CMD-SHELL", "curl -f http://namer:6980/api/healthcheck || exit 1" ]
+  #     test: [ "CMD-SHELL", "curl -f http://namer:6980/api/healthcheck || exit 1" ]
-      interval: 1m
+  #     interval: 1m
-      timeout: 30s
+  #     timeout: 30s
-    # retries: 3
+  #   # retries: 3
-    # start_period: 40s
+  #   # start_period: 40s
-    deploy:
+  #   deploy:
-      labels:
+  #     labels:
-        - homepage.group=Green Door
+  #       - homepage.group=Green Door
-        - homepage.name=Name
+  #       - homepage.name=Name
-        - homepage.icon=pritunl.png
+  #       - homepage.icon=pritunl.png
-        - homepage.href=http://namer.netgrimoire.com
+  #       - homepage.href=http://namer.netgrimoire.com
-        - homepage.description=Media Manager
+  #       - homepage.description=Media Manager
-        # - kuma.jgf.http.name="Namer"
+  #       # - kuma.jgf.http.name="Namer"
-        # - kuma.jgf.http.url=http://namer:6980
+  #       # - kuma.jgf.http.url=http://namer:6980
-      placement:
+  #     placement:
-        constraints:
+  #       constraints:
-          - node.hostname == nas
+  #         - node.hostname == nas
 
 
 networks:

wordpress-classifieds.yaml

@@ -1,5 +1,55 @@
-services:
+# services:
 
+#   wordpress:
+#     image: wordpress
+#     restart: always
+#     ports:
+#       - 8091:80
+#     environment:
+#       WORDPRESS_DB_HOST: wpdb
+#       WORDPRESS_DB_USER: traveler
+#       WORDPRESS_DB_PASSWORD: F@lcon13
+#       WORDPRESS_DB_NAME: wp
+#     volumes:
+#       - /data/nfs/Baxter/Docker/wp-pnc/wp:/var/www/html
+#     networks:
+#       - netgrimoire
+#     deploy:
+#       labels:
+#         - homepage.group=Application
+#         - homepage.name=PNCClassified
+#         - homepage.icon=wallos.png
+#         - homepage.href=http://classifieds.pncfishandmore.com
+#         - homepage.description=Classifies
+#         - kuma.wp.http.name="classified"
+#         - kuma.wallos.http.url=http://wordpress:80
+#         - caddy=classifieds.pncfishandmore.com
+#         - caddy.import=authentik
+#         - caddy.reverse_proxy="{{upstreams 80}}"
+
+#   wpdb:
+#     image: mysql:8.0
+#     restart: always
+#     environment:
+#       MYSQL_DATABASE: wp
+#       MYSQL_USER: traveler
+#       MYSQL_PASSWORD: F@lcon13
+#       MYSQL_RANDOM_ROOT_PASSWORD: '1'
+#     volumes:
+#       - /data/nfs/Baxter/Docker/wp-pnc/sql:/var/lib/mysql
+#     networks:
+#       - netgrimoire
+
+
+# volumes:
+#   wordpress:
+#   db:
+
+# networks:
+#   netgrimoire:
+#     external: true   
+
+services:
   wordpress:
     image: wordpress
     restart: always
@@ -10,6 +60,16 @@ services:
       WORDPRESS_DB_USER: traveler
       WORDPRESS_DB_PASSWORD: F@lcon13
       WORDPRESS_DB_NAME: wp
+      # Added SSL configurations
+      WORDPRESS_CONFIG_EXTRA: |
+        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:
@@ -19,13 +79,19 @@ services:
         - homepage.group=Application
         - homepage.name=PNCClassified
         - homepage.icon=wallos.png
-        - homepage.href=http://classifieds.pncfishandmore.com
+        - homepage.href=https://classifieds.pncfishandmore.com
         - homepage.description=Classifies
         - kuma.wp.http.name="classified"
         - kuma.wallos.http.url=http://wordpress:80
         - caddy=classifieds.pncfishandmore.com
         - caddy.import=authentik
         - caddy.reverse_proxy="{{upstreams 80}}"
+        # Added Caddy headers for SSL
+        - "caddy.header=Strict-Transport-Security \"max-age=31536000; includeSubDomains\""
+        - "caddy.header=X-Forwarded-Proto {http.request.scheme}"
+        - "caddy.header=X-Real-IP {http.request.remote.host}"
+        - "caddy.header=X-Forwarded-For {http.request.remote.host}"
+        - "caddy.header=Host {http.request.host}"
 
   wpdb:
     image: mysql:8.0
@@ -40,11 +106,10 @@ services:
     networks:
       - netgrimoire
 
-
 volumes:
   wordpress:
   db:
 
 networks:
   netgrimoire:
-    external: true   
+    external: true