Merge pull request #78 from bueltge/updates

Updates

Author: bueltge

.ddev/commands/favicon1.ico

@@ -5,28 +5,12 @@ if [ ! -z "${RECREATE_ENV}" ]; then
   wp db clean --yes
 fi
 
-if [ "${WP_MULTISITE}" = "true" ]; then
-  wp core multisite-install \
-    --title="${WP_TITLE}" \
-    --admin_user="${ADMIN_USER}" \
-    --admin_password="${ADMIN_PASS}" \
-    --url="${DDEV_PRIMARY_URL}" \
-    --admin_email="${ADMIN_EMAIL}" \
-    --skip-email
-
-readarray -d , -t slugs <<< "${WP_MULTISITE_SLUGS},"; unset "slugs[-1]";
-for slug in "${slugs[@]}"; do
-  if [ ! -z "${slug}" ]; then
-    wp site create --slug="${slug}"
-  fi
-done
 
-else
-  wp core install \
+wp core multisite-install \
     --title="${WP_TITLE}" \
     --admin_user="${ADMIN_USER}" \
     --admin_password="${ADMIN_PASS}" \
     --url="${DDEV_PRIMARY_URL}" \
     --admin_email="${ADMIN_EMAIL}" \
     --skip-email
-fi
+

.ddev/commands/favicon2.ico

@@ -1,4 +1,3 @@
 #!/bin/bash
 
 wp plugin is-installed akismet && wp plugin uninstall akismet
-wp plugin is-installed hello && wp plugin uninstall hello

.ddev/commands/favicon3.ico

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+pushd "${DDEV_DOCROOT}"
+
+wp user create usite1 [email protected] --role=administrator --porcelain --url="${DDEV_PRIMARY_URL}/site1"
+wp user create usite2 [email protected] --role=administrator --porcelain --url="${DDEV_PRIMARY_URL}/site2"
+wp user create usite3 [email protected] --role=administrator --porcelain --url="${DDEV_PRIMARY_URL}/site3"
+wp user create usite4 [email protected] --role=administrator --porcelain --url="${DDEV_PRIMARY_URL}/site4"
+wp user create usite5 [email protected] --role=administrator --porcelain --url="${DDEV_PRIMARY_URL}/site5"
+
+wp site create --slug="site1" [email protected]
+wp site create --slug="site2" [email protected]
+wp site create --slug="site3" [email protected]
+wp site create --slug="site4" [email protected]
+wp site create --slug="site5" [email protected]
+
+wp user set-role ${ADMIN_USER} administrator --url="${DDEV_PRIMARY_URL}/site1"
+wp user set-role ${ADMIN_USER} administrator --url="${DDEV_PRIMARY_URL}/site2"
+wp user set-role ${ADMIN_USER} administrator --url="${DDEV_PRIMARY_URL}/site3"
+wp user set-role ${ADMIN_USER} administrator --url="${DDEV_PRIMARY_URL}/site4"
+wp user set-role ${ADMIN_USER} administrator --url="${DDEV_PRIMARY_URL}/site5"
+
+wp plugin install user-switching --force --activate-network --version=1.7.0
+
+wp plugin activate hello --url="${DDEV_PRIMARY_URL}/site2"
+wp plugin activate hello --url="${DDEV_PRIMARY_URL}/site4"
+
+wp theme install twentytwentyone --force
+wp theme install twentytwentytwo --force
+wp theme install twentytwentythree --force
+wp theme install twentytwentyfour --force
+
+wp theme enable twentytwentyfour --network
+wp theme enable twentytwentythree --network
+wp theme enable twentytwentytwo --network
+wp theme enable twentytwentyone --network
+
+cp "/var/www/html/.ddev/commands/favicon1.ico" "/var/www/html/.ddev/wordpress/wp-content/themes/twentytwentyone/favicon.ico"
+cp "/var/www/html/.ddev/commands/favicon2.ico" "/var/www/html/.ddev/wordpress/wp-content/themes/twentytwentytwo/favicon.ico"
+cp "/var/www/html/.ddev/commands/favicon3.ico" "/var/www/html/.ddev/wordpress/wp-content/themes/twentytwentythree/favicon.ico"
+cp "/var/www/html/.ddev/commands/favicon4.ico" "/var/www/html/.ddev/wordpress/wp-content/themes/twentytwentyfour/favicon.ico"
+
+wp theme activate twentytwentyfour --url="${DDEV_PRIMARY_URL}/site4"
+wp theme activate twentytwentythree --url="${DDEV_PRIMARY_URL}/site3"
+wp theme activate twentytwentytwo --url="${DDEV_PRIMARY_URL}/site2"
+wp theme activate twentytwentyone --url="${DDEV_PRIMARY_URL}/site1"
+
+

.ddev/commands/favicon4.ico

@@ -1,7 +1,7 @@
 name: multisite-enhancements
 type: php
 docroot: .ddev/wordpress
-php_version: "8.3"
+php_version: "7.2"
 nodejs_version: "18"
 webserver_type: apache-fpm
 router_http_port: "80"
@@ -20,11 +20,9 @@ hooks:
         - exec-host: "mkdir -p .ddev/wordpress/wp-content/plugins/${DDEV_PROJECT}"
 
 web_environment:
-  - WP_VERSION=6.5.3
+  - WP_VERSION=6.5.4
   - WP_LOCALE=de_DE
-  - WP_TITLE=DDEV Search and Replace Test
-  - WP_MULTISITE=true
-  - WP_MULTISITE_SLUGS=seite1,seite2
+  - WP_TITLE=DDEV Multisite Enhancements Test
   - ADMIN_USER=admin
   - ADMIN_PASS=admin
   - [email protected]