Multi site configuration must first be enabled in user interface.

mschindl · Sep 12, 2017 · a072643 · a072643
1 parent 95cc398
commit a072643
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 86 deletions.
diff --git a/bootstrap/run b/bootstrap/run
@@ -46,28 +46,6 @@ if [ ! -f /opt/app-root/data/wp-config.php ]; then
         sed -i "/'DB_COLLATE', *'');/a\
 define('WP_ALLOW_MULTISITE', 'true');" $TMPCONFIG
 
-	case "$WORDPRESS_MULTISITE_TYPE" in
-	    [Ss]ub-domains)
-        sed -i "/'DB_COLLATE', *'');/a\
-define('SUBDOMAIN_INSTALL', true);\
-define('DOMAIN_CURRENT_SITE', '$WORDPRESS_MULTISITE_HOST');\
-define('PATH_CURRENT_SITE', '/');\
-define('SITE_ID_CURRENT_SITE', 1);\
-define('BLOG_ID_CURRENT_SITE', 1);" $TMPCONFIG
-		;;
-	    [Ss]ub-directories)
-        sed -i "/'DB_COLLATE', *'');/a\
-define('SUBDOMAIN_INSTALL', false);\
-define('DOMAIN_CURRENT_SITE', '$WORDPRESS_MULTISITE_HOST');\
-define('PATH_CURRENT_SITE', '/');\
-define('SITE_ID_CURRENT_SITE', 1);\
-define('BLOG_ID_CURRENT_SITE', 1);" $TMPCONFIG
-		;;
-	    *)
-		;;
-        esac
-    fi
-
     mv $TMPCONFIG /opt/app-root/data/wp-config.php
 fi
 
@@ -80,47 +58,7 @@ ln -s /opt/app-root/data/wp-config.php wp-config.php
 # then we need to generate it. This is placed in the persistent volume.
 
 if [ ! -f /opt/app-root/data/.htaccess ]; then
-    case "$WORDPRESS_MULTISITE_TYPE" in
-        [Ss]ub-domains)
-            cat > /opt/app-root/data/.htaccess << !
-# BEGIN WordPress
-RewriteEngine On
-RewriteBase /
-RewriteRule ^index\\.php\$ - [L]
-
-# add a trailing slash to /wp-admin
-RewriteRule ^wp-admin\$ wp-admin/ [R=301,L]
-
-RewriteCond %{REQUEST_FILENAME} -f [OR]
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule ^ - [L]
-RewriteRule ^(wp-(content|admin|includes).*) \$1 [L]
-RewriteRule ^(.*\\.php)\$ \$1 [L]
-RewriteRule . index.php [L]
-# END WordPress
-!
-            ;;
-        [Ss]ub-directories)
-            cat > /opt/app-root/data/.htaccess << !
-# BEGIN WordPress
-RewriteEngine On
-RewriteBase /
-RewriteRule ^index\\.php\$ - [L]
-
-# add a trailing slash to /wp-admin
-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]
-# END WordPress
-!
-            ;;
-        *)
-            cat > /opt/app-root/data/.htaccess << !
+    cat > /opt/app-root/data/.htaccess << !
 # BEGIN WordPress
 <IfModule mod_rewrite.c>
 RewriteEngine On
@@ -132,8 +70,6 @@ RewriteRule . /index.php [L]
 </IfModule>
 # END WordPress
 !
-            ;;
-    esac
 fi
 
 # Link the previously generated .htaccess from the persistent volume

diff --git a/templates/single-site.json b/templates/single-site.json
@@ -66,22 +66,10 @@
 	},
         {
             "name": "WORDPRESS_ALLOW_MULTISITE",
-            "description": "Whether WordPress should be setup for MultiSite.",
+            "description": "Allow WordPress to be configured as Multisite.",
             "value": "false",
             "required": true
         },
-        {
-            "name": "WORDPRESS_MULTISITE_HOST",
-            "description": "",
-            "value": "",
-            "required": true
-        },
-        {
-            "name": "WORDPRESS_MULTISITE_TYPE",
-            "description": "Type of Multisite network if Multisite enabled.",
-            "value": "Sub-domains",
-            "required": true
-        },
         {
             "name": "WORDPRESS_REPOSITORY",
             "description": "The source repository containing WordPress.",
@@ -253,14 +241,6 @@
                                     {
                                         "name": "WORDPRESS_ALLOW_MULTISITE",
                                         "value": "${WORDPRESS_ALLOW_MULTISITE}"
-                                    },
-                                    {
-                                        "name": "WORDPRESS_MULTISITE_HOST",
-                                        "value": "${WORDPRESS_MULTISITE_HOST}"
-                                    },
-                                    {
-                                        "name": "WORDPRESS_MULTISITE_TYPE",
-                                        "value": "${WORDPRESS_MULTISITE_TYPE}"
                                     }
                                 ],
                                 "volumeMounts": [