[SITE-1585] address diffs after rebase

composer.json

@@ -1,10 +1,24 @@
 {
-  "name": "roots/bedrock",
+  "name": "pantheon-systems/wordpress-composer-managed",
   "type": "project",
   "license": "MIT",
-  "description": "WordPress boilerplate with Composer, easier configuration, and an improved folder structure",
-  "homepage": "https://roots.io/bedrock/",
+  "description": "Pantheon's recommended starting point for WordPress upstreams using the platform's Integrated Composer build process.",
+  "homepage": "https://pantheon.io/docs/guides/wordpress-composer",
   "authors": [
+    {
+      "name": "Pantheon Systems",
+      "homepage": "https://pantheon.io"
+    },
+    {
+      "name": "John Spellman",
+      "email": "[email protected]",
+      "homepage": "https://github.com/jspellman814"
+    },
+    {
+      "name": "Chris Reynolds",
+      "email": "[email protected]",
+      "homepage": "https://github.com/jazzsequence"
+    },
     {
       "name": "Scott Walkinshaw",
       "email": "[email protected]",
@@ -17,11 +31,11 @@
     }
   ],
   "keywords": [
-    "bedrock", "composer", "roots", "wordpress", "wp", "wp-config"
+    "bedrock", "composer", "roots", "wordpress", "wp", "wp-config", "pantheon"
   ],
   "support": {
-    "issues": "https://github.com/roots/bedrock/issues",
-    "forum": "https://discourse.roots.io/category/bedrock"
+    "issues": "https://github.com/pantheon-systems/wordpress-composer-managed/issues",
+    "docs": "https://pantheon.io/docs/guides/wordpress-composer"
   },
   "repositories": [
     {
@@ -76,6 +90,12 @@
       "web/app/themes/{$name}/": ["type:wordpress-theme"]
     },
     "wordpress-install-dir": "web/wp",
+    "build-env": {
+      "install-cms": [
+        "wp core install --title={site-name} --url={site-url} --admin_user={account-name} --admin_email={account-mail} --admin_password={account-pass}",
+        "wp option update permalink_structure '/%postname%/'"
+      ]
+    },
     "composer-scaffold": {
       "locations": {
         "web-root": "./"

config/application.php

@@ -59,13 +59,6 @@
  */
 define( 'WP_ENV', env( 'WP_ENV' ) ?: 'production' );
 
-/**
- * Custom Content Directory
- */
-Config::define('CONTENT_DIR', '/app');
-Config::define('WP_CONTENT_DIR', $webroot_dir . Config::get('CONTENT_DIR'));
-Config::define('WP_CONTENT_URL', Config::get('WP_HOME') . Config::get('CONTENT_DIR'));
-
 /**
  * DB settings
  */