Make wordpress template leave mysql+http running, and start/enable them by default

Signed-off-by: Steven Dake <sdake@redhat.com>

diff --git a/templates/WordPress_Single_Instance.template b/templates/WordPress_Single_Instance.template
index 69d9b1133d6ff3c3eadf5839b9803a7485771c01..9e6f8f2f5c8bfd2ca52a25ceb05f10656a4aadc3 100644 (file)
--- a/templates/WordPress_Single_Instance.template
+++ b/templates/WordPress_Single_Instance.template
@@ -108,8 +108,8 @@
             },\r
             "services" : {\r
               "systemd" : {\r
-                "httpd"    : { "enabled" : "false", "ensureRunning" : "false" },\r
-                "mysqld"   : { "enabled" : "false", "ensureRunning" : "false" }\r
+                "httpd"    : { "enabled" : "true", "ensureRunning" : "true" },\r
+                "mysqld"   : { "enabled" : "true", "ensureRunning" : "true" }\r
               }\r
             }\r
           }\r
@@ -122,8 +122,6 @@
         "KeyName"        : { "Ref" : "KeyName" },\r
         "UserData"       : { "Fn::Base64" : { "Fn::Join" : ["", [\r
           "#!/bin/bash -v\n",\r
-\r
-          "systemctl start mysqld.service\n",\r
           "# Setup MySQL root password and create a user\n",\r
           "mysqladmin -u root password '", { "Ref" : "DBRootPassword" }, "'\n",\r
           "cat >> /tmp/mysql-wordpress-config << EOF\n",\r
@@ -134,7 +132,6 @@
           "EXIT\n",\r
           "EOF\n",\r
           "cat /tmp/mysql-wordpress-config | mysql -u root --password='", { "Ref" : "DBRootPassword" }, "' < /tmp/mysql-wordpress-config\n",\r
-          "systemctl stop mysqld.service\n",\r
           "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" }, "/ --e s/username_here/", { "Ref" : "DBUsername" }, "/ --e s/password_here/", { "Ref" : "DBPassword" }, "/ /usr/share/wordpress/wp-config.php\n",\r
           "cp /usr/share/wordpress/wp-config.php /usr/share/wordpress/wp-config.orig\n"\r
         ]]}}\r