Fixes for WordPress on App Engine standard.

Author: Takashi Matsuo

appengine/wordpress/README.md

@@ -51,24 +51,14 @@ name, the database name, and the user name.
 
 ### Create and configure a Cloud SQL 1st generation instance(for standard environment)
 
-You can create a new Cloud SQL First Generation instance with the
-following command:
-
-```
-$ gcloud sql instances create wp
-```
-
-Then change the root password for your instance:
-
-```
-$ gcloud sql instances set-root-password wp \
-  --password YOUR_INSTANCE_ROOT_PASSWORD # Don't use this password!
-```
-
 Go to the [SQL settings in the Cloud Console][sql-settings] and create
-a database named `wp`. Also create the `wp` database in the local
-mysql server. The local mysql instance is required to run `wp-cli`
-tool for installing/upgrading plugins and themes.
+an instance `wp` and database named `wp`. Go to the Access Control ->
+Users, then change the password for `root@localhost`. You will use
+this password for accessing from App Engine application.
+
+Also create the `wp` database in the local mysql server. The local
+mysql instance is required to run `wp-cli` tool for
+installing/upgrading plugins and themes.
 
 ### Create and configure a Cloud SQL 2nd generation instance(for flexible environment)
 

appengine/wordpress/src/WordPressSetup.php

@@ -98,6 +98,20 @@ protected function configure()
                 'Cloud SQL database password',
                 ''
             )
+            ->addOption(
+                'local_db_user',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Local SQL database username',
+                ''
+            )
+            ->addOption(
+                'local_db_password',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'Local SQL database password',
+                ''
+            )
             ->addOption(
                 'wordpress_url',
                 null,
@@ -155,7 +169,7 @@ protected function askParameters(
                 }
                 $q = new Question(
                     'Please enter ' . $key . $note . ': ', $default);
-                if ($key === 'db_password') {
+                if (strpos($key, 'password') !== false) {
                     $q->setHidden(true);
                     $q->setHiddenFallback(false);
                 }
@@ -249,12 +263,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $dir . '/wordpress/wp-content/object-cache.php'
         );
 
-        $configKeys = array(
+        $keys = array(
             'project_id' => '',
             'db_instance' => 'wp',
             'db_name' => 'wp',
             'db_user' => 'wp',
-            'db_password' => ''
+            'db_password' => '',
         );
         if ($env === self::STANDARD_ENV) {
             $copyFiles = array(
@@ -287,7 +301,22 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $templateDir = __DIR__ . '/files/flexible';
         }
         $params = array();
-        $this->askParameters($configKeys, $params, $input, $output, $helper);
+        $this->askParameters($keys, $params, $input, $output, $helper);
+        $q = new ConfirmationQuestion(
+            'Do you want to use the same db user and password for '
+            . 'local run? (Y/n)',
+            true
+        );
+        if ($helper->ask($input, $output, $q)) {
+            $params['local_db_user'] = $params['db_user'];
+            $params['local_db_password'] = $params['db_password'];
+        } else {
+            $keys = array(
+                'local_db_user' => 'wp',
+                'local_db_password' => '',
+            );
+            $this->askParameters($keys, $params, $input, $output, $helper);
+        }
         $this->addAuthKeys($params);
         $project->copyFiles($templateDir, $copyFiles, $params);
         if (!$this->report($output, $project)) {

appengine/wordpress/src/files/flexible/wp-config.php

@@ -85,9 +85,9 @@
     /** The name of the database for WordPress */
     define('DB_NAME', '{{db_name}}');
     /** MySQL database username */
-    define('DB_USER', '{{db_user}}');
+    define('DB_USER', '{{local_db_user}}');
     /** MySQL database password */
-    define('DB_PASSWORD', '{{db_password}}');
+    define('DB_PASSWORD', '{{local_db_password}}');
     define('DB_HOST', '127.0.0.1');
 }
 

appengine/wordpress/src/files/standard/wp-config.php

@@ -52,18 +52,17 @@
 if ($onGae) {
     /** The name of the Cloud SQL database for WordPress */
     define('DB_NAME', '{{db_name}}');
-    /** Live environment Cloud SQL login and SITE_URL info */
-    /** From App Engine, the password is not required, so leave it blank here */
+    /** Production login info */
     define('DB_HOST', ':/cloudsql/{{project_id}}:{{db_instance}}');
-    define('DB_USER', 'root');
-    define('DB_PASSWORD', '');
+    define('DB_USER', '{{db_user}}');
+    define('DB_PASSWORD', '{{db_password}}');
 } else {
     /** The name of the local database for WordPress */
     define('DB_NAME', '{{db_name}}');
     /** Local environment MySQL login info */
     define('DB_HOST', '127.0.0.1');
-    define('DB_USER', '{{db_user}}');
-    define('DB_PASSWORD', '{{db_password}}');
+    define('DB_USER', '{{local_db_user}}');
+    define('DB_PASSWORD', '{{local_db_password}}');
 }
 
 /** Database Charset to use in creating database tables. */

appengine/wordpress/tests/StdTest.php

@@ -55,7 +55,7 @@ public static function setUpBeforeClass()
         $target = self::getTargetDir();
         $command = "php $helper setup -d $target "
             . " -n -p $project_id --env=s "
-            . "--db_instance=wp-std --db_name=wp --db_user=wp "
+            . "--db_instance=wp-std --db_name=wp --db_user=root "
             . "--db_password=$db_password";
         $wp_url = getenv('WP_DOWNLOAD_URL');
         if ($wp_url !== false) {