diff --git a/.ddev/commands/web/orchestrate.d/10_wp_install.sh b/.ddev/commands/web/orchestrate.d/10_wp_install.sh index 417792bf3..b74209903 100644 --- a/.ddev/commands/web/orchestrate.d/10_wp_install.sh +++ b/.ddev/commands/web/orchestrate.d/10_wp_install.sh @@ -14,21 +14,6 @@ if [ "${WP_MULTISITE}" = "true" ]; then --admin_email="${ADMIN_EMAIL}" \ --skip-email - cat << 'EOF' >> ".htaccess" -RewriteEngine On -RewriteBase / -RewriteRule ^index\.php$ - [L] - -RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L] - -RewriteCond %{REQUEST_FILENAME} -f [OR] -RewriteCond %{REQUEST_FILENAME} -d -RewriteRule ^ - [L] -RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L] -RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] -RewriteRule . index.php [L] -EOF - readarray -d , -t slugs <<< "${WP_MULTISITE_SLUGS},"; unset "slugs[-1]"; for slug in "${slugs[@]}"; do if [ ! -z "${slug}" ]; then diff --git a/.ddev/commands/web/orchestrate.d/11_htaccess.sh b/.ddev/commands/web/orchestrate.d/11_htaccess.sh new file mode 100644 index 000000000..40789ed22 --- /dev/null +++ b/.ddev/commands/web/orchestrate.d/11_htaccess.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +cat << 'EOF' >> ".htaccess" +RewriteEngine On +RewriteBase / +RewriteRule ^index\.php$ - [L] + +RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L] + +RewriteCond %{REQUEST_FILENAME} -f [OR] +RewriteCond %{REQUEST_FILENAME} -d +RewriteRule ^ - [L] +RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L] +RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] +RewriteRule . index.php [L] +EOF diff --git a/.ddev/commands/web/orchestrate.d/60_flush_rewrites.sh b/.ddev/commands/web/orchestrate.d/60_flush_rewrites.sh index 32fdc1064..d1bdc82bb 100644 --- a/.ddev/commands/web/orchestrate.d/60_flush_rewrites.sh +++ b/.ddev/commands/web/orchestrate.d/60_flush_rewrites.sh @@ -1,9 +1,4 @@ #!/bin/bash -# Needed for generating the .htaccess file -echo "apache_modules: - - mod_rewrite -" > wp-cli.yml - wp rewrite structure '/%postname%' -wp rewrite flush --hard +wp rewrite flush