Simplify the template more.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/templates/WordPress_Single_Instance.template b/templates/WordPress_Single_Instance.template
index f77c877b8aeaccba50fa949bf56eb0a673c340ad..9a67ebaf11c39f3477b33feb1b24884835f2b941 100644 (file)
--- a/templates/WordPress_Single_Instance.template
+++ b/templates/WordPress_Single_Instance.template
@@ -51,6 +51,7 @@
     },\r
 \r
     "DBRootPassword": {\r
+      "Default": "admin",\r
       "NoEcho": "true",\r
       "Description" : "Root password for MySQL",\r
       "Type": "String",\r
@@ -87,28 +88,6 @@
 \r
   "Resources" : {\r
 \r
-    "CfnUser" : {\r
-      "Type" : "AWS::IAM::User",\r
-      "Properties" : {\r
-        "Path": "/",\r
-        "Policies": [{\r
-          "PolicyName": "root",\r
-          "PolicyDocument": { "Statement":[{\r
-            "Effect":"Allow",\r
-            "Action":"cloudformation:DescribeStackResource",\r
-            "Resource":"*"\r
-          }]}\r
-        }]\r
-      }\r
-    },\r
-\r
-    "HostKeys" : {\r
-      "Type" : "AWS::IAM::AccessKey",\r
-      "Properties" : {\r
-        "UserName" : {"Ref": "CfnUser"}\r
-      }\r
-    },\r
-\r
     "WebServer": {\r
       "Type": "AWS::EC2::Instance",\r
       "Metadata" : {\r
@@ -117,66 +96,15 @@
             "packages" : {\r
               "yum" : {\r
                 "httpd"        : [],\r
-                "php"          : [],\r
-                "php-mysql"    : [],\r
                 "mysql"        : [],\r
                 "mysql-server" : [],\r
-                "mysql-devel"  : [],\r
-                "mysql-libs"   : []\r
-              }\r
-            },\r
-\r
-            "sources" : {\r
-              "/var/www/html" : "http://wordpress.org/latest.tar.gz"\r
-            },\r
-\r
-            "files" : {\r
-              "/tmp/setup.mysql" : {\r
-                "content" : { "Fn::Join" : ["", [\r
-                  "CREATE DATABASE ", { "Ref" : "DBName" }, ";\n",\r
-                  "CREATE USER '", { "Ref" : "DBUsername" }, "'@'localhost' IDENTIFIED BY '", { "Ref" : "DBPassword" }, "';\n",\r
-                  "GRANT ALL ON ", { "Ref" : "DBName" }, ".* TO '", { "Ref" : "DBUsername" }, "'@'localhost';\n",\r
-                  "FLUSH PRIVILEGES;\n"\r
-                  ]]},\r
-                "mode"  : "000644",\r
-                "owner" : "root",\r
-                "group" : "root"\r
-              },\r
-\r
-              "/var/www/html/wordpress/wp-config.php" : {\r
-                "content" : { "Fn::Join" : ["", [\r
-                  "<?php\n",\r
-                  "define('DB_NAME',          '", {"Ref" : "DBName"}, "');\n",\r
-                  "define('DB_USER',          '", {"Ref" : "DBUsername"}, "');\n",\r
-                  "define('DB_PASSWORD',      '", {"Ref" : "DBPassword" }, "');\n",\r
-                  "define('DB_HOST',          'localhost');\n",\r
-                  "define('DB_CHARSET',       'utf8');\n",\r
-                  "define('DB_COLLATE',       '');\n",\r
-                  "define('AUTH_KEY',         'f@A17vs{ mO0}:&I,6SB.QzV`E?!`/tN5:~GZX%=@ZA%!_T0-]9>g]4ll6~,6G|R');\n",\r
-                  "define('SECURE_AUTH_KEY',  'gTFTI|~rYHY)|mlu:Cv7RN]GQ^3ngyUbw;L0o!12]0c-ispR<-yt3qj]xjquz^&9');\n",\r
-                  "define('LOGGED_IN_KEY',    'Jd:HG9M)1p5t2<v~+R-vd{p-Q*|*RB^&PUI{vIrydAEEiV!{HS{jN:nErCmLv`p}');\n",\r
-                  "define('NONCE_KEY',        '4aMj4KZV;,Gu7(B|qOCve[c5?*J5x1+x93i:Ey6hh/6jXh+V_{V4+hw!qE^d*U,-');\n",\r
-                  "define('AUTH_SALT',        '_Y_&8m)FH)Cns)8}Yb8b88KDSn:p1#p(qBa<~VW&Y1v}P.*9/8S8@P`{mkNxV lC');\n",\r
-                  "define('SECURE_AUTH_SALT', '%nG3Ag41^Lew5c86,#zbN:yPFs.GA5a)z5*:Oce1>v6uF~D`,.o1pzS)F8[bM9i[');\n",\r
-                  "define('LOGGED_IN_SALT',   '~K<y+Ly+_Ww1~dtq>;rSQ^+{P5/k|=!]k%RXAF-Y@XMY6GSp+wJ5{(|rCzaWjZ%/');\n",\r
-                  "define('NONCE_SALT',       ',Bs_*Y9:b/1Z:apVLHtz35uim|okkA,b|Jt[-&Nla=T{<l_#D?~6Tj-.2.]FonI~');\n",\r
-                  "define('WPLANG'            , '');\n",\r
-                  "define('WP_DEBUG'          , false);\n",\r
-                  "$table_prefix  = 'wp_';\n",\r
-                  "if ( !defined('ABSPATH') )\n",\r
-                  "    define('ABSPATH', dirname(__FILE__) . '/');\n",\r
-                  "require_once(ABSPATH . 'wp-settings.php');\n"\r
-                ]] },\r
-                "mode" : "000644",\r
-                "owner" : "root",\r
-                "group" : "root"\r
+                "wordpress"    : []\r
               }\r
             },\r
             "services" : {\r
-              "sysvinit" : {\r
-                "httpd"    : { "enabled" : "true", "ensureRunning" : "true" },\r
-                "mysqld"   : { "enabled" : "true", "ensureRunning" : "true" },\r
-                "sendmail" : { "enabled" : "false", "ensureRunning" : "false" }\r
+              "systemd" : {\r
+                "httpd.service"    : { "enabled" : "false", "ensureRunning" : "true" },\r
+                "mysqld.service"   : { "enabled" : "false", "ensureRunning" : "true" }\r
               }\r
             }\r
           }\r
@@ -186,68 +114,26 @@
         "ImageId" : { "Fn::FindInMap" : [ "AWSRegionArch2AMI", { "Ref" : "AWS::Region" },\r
                           { "Fn::FindInMap" : [ "AWSInstanceType2Arch", { "Ref" : "InstanceType" }, "Arch" ] } ] },\r
         "InstanceType"   : { "Ref" : "InstanceType" },\r
-        "SecurityGroups" : [ {"Ref" : "WebServerSecurityGroup"} ],\r
         "KeyName"        : { "Ref" : "KeyName" },\r
         "UserData"       : { "Fn::Base64" : { "Fn::Join" : ["", [\r
           "#!/bin/bash -v\n",\r
-          "yum update -y aws-cfn-bootstrap\n",\r
-\r
-          "# Helper function\n",\r
-          "function error_exit\n",\r
-          "{\n",\r
-          "  /opt/aws/bin/cfn-signal -e 1 -r \"$1\" '", { "Ref" : "WaitHandle" }, "'\n",\r
-          "  exit 1\n",\r
-          "}\n",\r
-\r
-          "# Install Apache Web Server, MySQL, PHP and WordPress\n",\r
-          "/opt/aws/bin/cfn-init -s ", { "Ref" : "AWS::StackName" }, " -r WebServer ",\r
-          "    --access-key ",  { "Ref" : "HostKeys" },\r
-          "    --secret-key ", {"Fn::GetAtt": ["HostKeys", "SecretAccessKey"]},\r
-          "    --region ", { "Ref" : "AWS::Region" }, " || error_exit 'Failed to run cfn-init'\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" }, "' || error_exit 'Failed to initialize root password'\n",\r
-          "mysql -u root --password='", { "Ref" : "DBRootPassword" }, "' < /tmp/setup.mysql || error_exit 'Failed to create database user'\n",\r
-\r
-          "# Setup correct file ownership\n",\r
-          "chown -R apache:apache /var/www/html/wordpress\n",\r
-\r
-          "# All is well so signal success\n",\r
-          "/opt/aws/bin/cfn-signal -e 0 -r \"WordPress setup complete\" '", { "Ref" : "WaitHandle" }, "'\n"\r
-\r
+          "mysqladmin -u root password '", { "Ref" : "DBRootPassword" }, "'\n",\r
+          "cat >> /tmp/mysql-wordpress-config &lt;&lt; EOF\n",\r
+          "CREATE DATABASE ", { "Ref" : "DBName" }, ";\n",\r
+          "GRANT ALL PRIVILEGES ON ", { "Ref" : "DBName" }, ".* TO ", { "Ref" : "DBUsername" }, "@localhost\n",\r
+          "IDENTIFIED BY ", { "Ref" : "DBPassword" }, ";\n",\r
+          "FLUSH PRIVILEGES;\n",\r
+          "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
       }\r
-    },\r
-\r
-    "WaitHandle" : {\r
-      "Type" : "AWS::CloudFormation::WaitConditionHandle"\r
-    },\r
-\r
-    "WaitCondition" : {\r
-      "Type" : "AWS::CloudFormation::WaitCondition",\r
-      "DependsOn" : "WebServer",\r
-      "Properties" : {\r
-        "Handle" : {"Ref" : "WaitHandle"},\r
-        "Timeout" : "300"\r
-      }\r
-    },\r
-\r
-    "WebServerSecurityGroup" : {\r
-      "Type" : "AWS::EC2::SecurityGroup",\r
-      "Properties" : {\r
-        "GroupDescription" : "Enable HTTP access via port 80 and SSH access",\r
-        "SecurityGroupIngress" : [\r
-          {"IpProtocol" : "tcp", "FromPort" : "80", "ToPort" : "80", "CidrIp" : "0.0.0.0/0"},\r
-          {"IpProtocol" : "tcp", "FromPort" : "22", "ToPort" : "22", "CidrIp" : "0.0.0.0/0"}\r
-        ]\r
-      }\r
-    }\r
-  },\r
-\r
-  "Outputs" : {\r
-    "WebsiteURL" : {\r
-      "Value" : { "Fn::Join" : ["", ["http://", { "Fn::GetAtt" : [ "WebServer", "PublicDnsName" ]}, "/wordpress"]] },\r
-      "Description" : "WordPress Website"\r
     }\r
   }\r
 }\r