Merge pull request #12 from kanopi/pantheon-test

Fixes for pantheon

Author: paulsheldrake

README.md

@@ -11,6 +11,9 @@ A comprehensive DDEV add-on that provides Kanopi's battle-tested workflow for Wo
 ## 🚀 Quick Start
 
 ```bash
+# Intialize a project
+ddev config --project-type=wordpress 
+
 # Install the add-on
 ddev add-on get kanopi/ddev-kanopi-wp
 
@@ -82,7 +85,7 @@ ddev restart
 ### New Projects
 ```bash
 # Initialize DDEV
-ddev config --project-type=wordpress --docroot=public # or web or wp...
+ddev config --project-type=wordpress
 
 # Install add-on
 ddev add-on get kanopi/ddev-kanopi-wp

commands/host/project-configure

@@ -437,42 +437,41 @@ fi
 if [ -n "$PROXY_URL" ]; then
     echo "Configuring nginx proxy..."
 
-    # Create nginx directory if it doesn't exist
-    mkdir -p .ddev/nginx
-
-    # Extract hostname from PROXY_URL for Host header
-    PROXY_HOST=$(echo "$PROXY_URL" | sed 's|https\://||' | sed 's|http://||' | sed 's|/.*||')
-
-    # Process nginx configuration template - use the current add-on source if available
-    NGINX_MAIN_TEMPLATE=""
-    NGINX_SNIPPET_TEMPLATE=""
-
-    # Try to find the templates in the add-on metadata
-    if [ -f ".ddev/addon-metadata/ddev-kanopi-wp/config/nginx/nginx-site-main.conf" ]; then
-        NGINX_MAIN_TEMPLATE=".ddev/addon-metadata/ddev-kanopi-wp/config/nginx/nginx-site-main.conf"
-    fi
-
-    if [ -f ".ddev/addon-metadata/ddev-kanopi-wp/config/nginx/nginx-site.conf" ]; then
-        NGINX_SNIPPET_TEMPLATE=".ddev/addon-metadata/ddev-kanopi-wp/config/nginx/nginx-site.conf"
-    fi
+    # Get the actual docroot from DDEV configuration
+    DOCROOT=$(grep '^docroot:' .ddev/config.yaml | cut -d: -f2 | tr -d ' ' || echo "web")
 
-    if [ -n "$NGINX_MAIN_TEMPLATE" ]; then
-        # Get the actual docroot from DDEV configuration
-        DOCROOT=$(grep '^docroot:' .ddev/config.yaml | cut -d: -f2 | tr -d ' ' || echo "web")
-
-        # Create complete nginx configuration to override DDEV's default
-        # First remove #ddev-generated marker, then do all replacements
-        sed '1s/^#ddev-generated$//' "$NGINX_MAIN_TEMPLATE" | \
-            sed "s|PROXY_URL_PLACEHOLDER|$PROXY_URL|g; s|HOST_PLACEHOLDER|$PROXY_HOST|g; s|/var/www/html/public|/var/www/html/$DOCROOT|g" \
-            > ".ddev/nginx_full/nginx-site.conf"
-        echo "  ✅ Complete nginx proxy configuration created (docroot: $DOCROOT)"
-    elif [ -n "$NGINX_SNIPPET_TEMPLATE" ]; then
-        # Fallback to snippet approach
-        sed "s|PROXY_URL_PLACEHOLDER|$PROXY_URL|g; s|HOST_PLACEHOLDER|$PROXY_HOST|g" \
-            "$NGINX_SNIPPET_TEMPLATE" > ".ddev/nginx/nginx-site.conf"
-        echo "  ✅ Nginx proxy snippet created"
+    # Check if nginx_full/nginx-site.conf exists
+    if [ -f ".ddev/nginx_full/nginx-site.conf" ]; then
+        # Extract hosting domain and environment from PROXY_URL
+        # Example: https://dev-sitename.pantheonsite.io -> domain=pantheonsite.io, env=dev
+        PROXY_HOST=$(echo "$PROXY_URL" | sed 's|https\://||' | sed 's|http://||' | sed 's|/.*||')
+
+        # Determine hosting domain based on provider
+        case "$HOST_PROVIDER" in
+            "pantheon")
+                HOSTING_DOMAIN="pantheonsite.io"
+                ;;
+            "wpengine")
+                HOSTING_DOMAIN="wpengine.com"
+                ;;
+            "kinsta")
+                HOSTING_DOMAIN="kinsta.cloud"
+                ;;
+            *)
+                HOSTING_DOMAIN=""
+                ;;
+        esac
+
+        # Update the nginx configuration with actual values
+        sed -i.bak \
+            -e "s|HOSTING_ENV-HOSTING_SITE.HOSTING_DOMAIN|$PROXY_HOST|g" \
+            -e "s|/var/www/html/web|/var/www/html/$DOCROOT|g" \
+            ".ddev/nginx_full/nginx-site.conf"
+        rm -f ".ddev/nginx_full/nginx-site.conf.bak"
+
+        echo "  ✅ Nginx proxy configuration updated (docroot: $DOCROOT, proxy: $PROXY_HOST)"
     else
-        echo "  ⚠️  Nginx template not found - proxy configuration not updated"
+        echo "  ⚠️  .ddev/nginx_full/nginx-site.conf not found - proxy configuration not updated"
     fi
 fi
 

config/nginx/nginx-common.conf

@@ -4,6 +4,8 @@ name: ddev-kanopi-wp
 project_files:
 - commands/
 - config/
+- php
+- nginx_full
 - scripts/
 
 # DDEV version constraint

config/nginx/nginx-site.conf

@@ -1,15 +1,18 @@
-#ddev-generated
-# ddev wordpress config with Kanopi proxy support
+# ddev wordpress config
 # https://developer.wordpress.org/advanced-administration/server/web-server/nginx/
 
+# If you want to take over this file and customize it, remove the line above
+# and ddev will respect it and won't overwrite the file.
+# See https://ddev.readthedocs.io/en/stable/users/extend/customization-extendibility/#custom-nginx-configuration
+
 # Much of this config is adapted from
 # https://codex.wordpress.org/Nginx
 
 server {
     listen 80 default_server;
     listen 443 ssl default_server;
 
-    root /var/www/html/public;
+    root /var/www/html/web;
 
     ssl_certificate /etc/ssl/certs/master.crt;
     ssl_certificate_key /etc/ssl/certs/master.key;
@@ -50,22 +53,14 @@ server {
         deny all;
     }
 
-    # Image proxy configuration for wp-content/uploads
-    location ~ ^/wp-content/uploads/.* {
-        try_files $uri @proxy;
-    }
+    # Try WordPress uploads locally then at a proxy URL
+	location ~ ^/wp-content/uploads/.* {
+		try_files $uri @rewrite @proxy;
+	}
 
-    location @proxy {
-        # Proxy missing uploads to hosting provider environment
-        resolver 8.8.8.8;
-        proxy_pass PROXY_URL_PLACEHOLDER$request_uri;
-        proxy_set_header Host HOST_PLACEHOLDER;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_ssl_verify off;
-        proxy_intercept_errors on;
-    }
+	location @proxy {
+		rewrite ^/(.*)$ https://HOSTING_ENV-HOSTING_SITE.HOSTING_DOMAIN/$1;
+	}
 
     location / {
         absolute_redirect off;
@@ -100,8 +95,8 @@ server {
 
     # Expire rules for static content
 
-    # Media: images, icons, video, audio, HTC (exclude wp-content/uploads which has proxy)
-    location ~* ^(?!/wp-content/uploads).*\.(jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|webp|htc)$ {
+    # Media: images, icons, video, audio, HTC
+    location ~* \.(jpg|jpeg|gif|png|ico|cur|gz|svg|svgz|mp4|ogg|ogv|webm|webp|htc)$ {
         expires max;
         log_not_found off;
         try_files $uri /index.php$is_args$args;
@@ -112,4 +107,4 @@ server {
     }
     include /etc/nginx/common.d/*.conf;
     include /mnt/ddev_config/nginx/*.conf;
-}
+}

config/php/php.ini

@@ -0,0 +1,6 @@
+#ddev-generated
+; Custom PHP configuration for Kanopi WordPress development
+
+[php]
+; Memory limit for WordPress operations.  Most hosting has low memory
+memory_limit = 256M