heat templates : Update Wordpress config for F18 guests

F18 contains apache 2.4 which requires a different syntax to enable
non-local access to the wordpress install

fixes bug #1166897

Change-Id: Ia63cceeba35904f05a1b4cf76fc075d3cdc7cd86

diff --git a/templates/WordPress_2_Instances.template b/templates/WordPress_2_Instances.template
index 427ae972b45c70565bdf4478408814d9bb9fa528..195401a292e4fb3dae6dd7697462d2169a685a7f 100644 (file)
--- a/templates/WordPress_2_Instances.template
+++ b/templates/WordPress_2_Instances.template
@@ -161,6 +161,7 @@
           "#!/bin/bash -v\n",
           "/opt/aws/bin/cfn-init\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" }, "/ --e s/username_here/", { "Ref" : "DBUsername" }, "/ --e s/password_here/", { "Ref" : "DBPassword" }, "/ --e s/localhost/", { "Fn::GetAtt" : [ "DatabaseServer", "PublicIp" ]}, "/ /usr/share/wordpress/wp-config.php\n",
           "systemctl restart httpd.service\n"
         ]]}}

diff --git a/templates/WordPress_2_Instances_With_EBS.template b/templates/WordPress_2_Instances_With_EBS.template
index 968b0aadbc38cd7d8da620c9ff6a1cb7671676ed..5d3c93d086a5605b9d03246ffa217ab756b52fcb 100644 (file)
--- a/templates/WordPress_2_Instances_With_EBS.template
+++ b/templates/WordPress_2_Instances_With_EBS.template
@@ -195,6 +195,7 @@
           "#!/bin/bash -v\n",
           "/opt/aws/bin/cfn-init\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" }, "/ --e s/username_here/", { "Ref" : "DBUsername" }, "/ --e s/password_here/", { "Ref" : "DBPassword" }, "/ --e s/localhost/", { "Fn::GetAtt" : [ "WikiDatabase", "PublicIp" ]}, "/ /usr/share/wordpress/wp-config.php\n",
           "systemctl restart httpd.service\n"
         ]]}}

diff --git a/templates/WordPress_2_Instances_With_EBS_EIP.template b/templates/WordPress_2_Instances_With_EBS_EIP.template
index c6c31983edfe5d8e16787483130fe4813d4745eb..bf3533d9821bef967ecde5a2ce8521f34bb0c902 100644 (file)
--- a/templates/WordPress_2_Instances_With_EBS_EIP.template
+++ b/templates/WordPress_2_Instances_With_EBS_EIP.template
@@ -231,6 +231,7 @@
           "#!/bin/bash -v\n",
           "/opt/aws/bin/cfn-init\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" }, "/ --e s/username_here/", { "Ref" : "DBUsername" }, "/ --e s/password_here/", { "Ref" : "DBPassword" }, "/ --e s/localhost/", { "Ref" : "DatabaseIPAddress" }, "/ /usr/share/wordpress/wp-config.php\n",
           "systemctl restart httpd.service\n"
         ]]}}

diff --git a/templates/WordPress_And_Http.template b/templates/WordPress_And_Http.template
index 96573e7d0443f8004ac170c19b17e75a980cf3fc..9a1adca8d398feeb678c3695ab6729def7d7fa22 100644 (file)
--- a/templates/WordPress_And_Http.template
+++ b/templates/WordPress_And_Http.template
@@ -117,6 +117,7 @@
           "#!/bin/bash -v\n",
           "/opt/aws/bin/cfn-init\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "sed --in-place --e s/database_name_here/", { "Ref": "DBName" },
           "/ --e s/username_here/", { "Ref": "DBUsername" },
           "/ --e s/password_here/", { "Ref": "DBPassword" },

diff --git a/templates/WordPress_Composed_Instances.template b/templates/WordPress_Composed_Instances.template
index 77f31d47938c8d483b388e7896ab2a9293de3cbf..b85193173cedff8caec7c46f71e58ba842773fe0 100644 (file)
--- a/templates/WordPress_Composed_Instances.template
+++ b/templates/WordPress_Composed_Instances.template
@@ -137,6 +137,7 @@
           "#!/bin/bash -v\n",
           "/opt/aws/bin/cfn-init\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" }, "/ --e s/username_here/", { "Ref" : "DBUsername" }, "/ --e s/password_here/", { "Ref" : "DBPassword" }, "/ --e s/localhost/", { "Fn::GetAtt" : [ "DatabaseTemplate", "Outputs.PublicIp" ]}, "/ /usr/share/wordpress/wp-config.php\n",
           "systemctl restart httpd.service\n"
         ]]}}

diff --git a/templates/WordPress_NoKey.template b/templates/WordPress_NoKey.template
index b9f2f925351a6526e6de3e792a6b80dbfedb0757..f836c14b65cf41c870bc4e52e29e9c04029f3786 100644 (file)
--- a/templates/WordPress_NoKey.template
+++ b/templates/WordPress_NoKey.template
@@ -127,6 +127,7 @@
           "EOF\n",
           "cat /tmp/mysql-wordpress-config | mysql -u root --password='", { "Ref" : "DBRootPassword" }, "' < /tmp/mysql-wordpress-config\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "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",
           "cp /usr/share/wordpress/wp-config.php /usr/share/wordpress/wp-config.orig\n"
         ]]}}

diff --git a/templates/WordPress_Single_Instance.template b/templates/WordPress_Single_Instance.template
index da2b379f3fe7dbf7063e181cdef05cc2eb53f18d..3d79430261cf21b82f2f0b1cf6984d601f6fe5b7 100644 (file)
--- a/templates/WordPress_Single_Instance.template
+++ b/templates/WordPress_Single_Instance.template
@@ -132,6 +132,7 @@
           "EXIT\n",
           "EOF\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "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",
           "systemctl restart httpd.service\n"
         ]]}}

diff --git a/templates/WordPress_Single_Instance.yaml b/templates/WordPress_Single_Instance.yaml
index 2990c66d47950c1795a10e4afe67d605676a4f84..eed4fcf048a75a216364f9124d4a2d91e9908e39 100644 (file)
--- a/templates/WordPress_Single_Instance.yaml
+++ b/templates/WordPress_Single_Instance.yaml
@@ -133,6 +133,9 @@ Resources:
               '
             - 'sed -i "/Deny from All/d" /etc/httpd/conf.d/wordpress.conf
 
+              '
+            - 'sed -i "s/Require local/Require all granted/" /etc/httpd/conf.d/wordpress.conf
+
               '
             - sed --in-place --e s/database_name_here/
             - {Ref: DBName}

diff --git a/templates/WordPress_Single_Instance_With_EBS.template b/templates/WordPress_Single_Instance_With_EBS.template
index a8343988ec78fa5e28783ca36ba7e4852c89c365..dbb511326f6a219056150483a431ebea56f59304 100644 (file)
--- a/templates/WordPress_Single_Instance_With_EBS.template
+++ b/templates/WordPress_Single_Instance_With_EBS.template
@@ -157,6 +157,7 @@
           "EXIT\n",
           "EOF\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "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",
           "systemctl restart httpd.service\n"
         ]]}}

diff --git a/templates/WordPress_Single_Instance_With_EBS_EIP.template b/templates/WordPress_Single_Instance_With_EBS_EIP.template
index 21fa1d38ba6c53f5e20ec9c43f55cec671afdfad..1cd3c4684c549516c09de4e65eb617b9be713b6e 100644 (file)
--- a/templates/WordPress_Single_Instance_With_EBS_EIP.template
+++ b/templates/WordPress_Single_Instance_With_EBS_EIP.template
@@ -181,6 +181,7 @@
           "EXIT\n",
           "EOF\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "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",
           "systemctl restart httpd.service\n"
         ]]}}

diff --git a/templates/WordPress_Single_Instance_With_EIP.template b/templates/WordPress_Single_Instance_With_EIP.template
index e2dcbf83ff0becc8347656b04e18c1ea6d299cbe..bfe1d68bb2baa578e3cc487d48dc67dd90bf1ca3 100644 (file)
--- a/templates/WordPress_Single_Instance_With_EIP.template
+++ b/templates/WordPress_Single_Instance_With_EIP.template
@@ -157,6 +157,7 @@
           "EXIT\n",
           "EOF\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "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",
           "systemctl restart httpd.service\n"
         ]]}}

diff --git a/templates/WordPress_Single_Instance_With_HA.template b/templates/WordPress_Single_Instance_With_HA.template
index f31bcc76b11ce39b47b9c950212f9d6b8846c285..b3a96bfbc8b278f4ad59bcc9c5ea20fad51c276f 100644 (file)
--- a/templates/WordPress_Single_Instance_With_HA.template
+++ b/templates/WordPress_Single_Instance_With_HA.template
@@ -254,6 +254,7 @@
           "' < /tmp/setup.mysql || error_exit 'Failed to create database.'\n",
 
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" },
           "/ --e s/username_here/", { "Ref" : "DBUsername" },
           "/ --e s/password_here/", { "Ref" : "DBPassword" },

diff --git a/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template b/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template
index 69ddb82b81a1cc9534566bb8bb17ad7e57146517..36d0603aadad52c57747c59b4ca29ab22daab9b7 100644 (file)
--- a/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template
+++ b/templates/WordPress_Single_Instance_With_HA_AccessPolicy.template
@@ -263,6 +263,7 @@
           "' < /tmp/setup.mysql || error_exit 'Failed to create database.'\n",
 
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" },
           "/ --e s/username_here/", { "Ref" : "DBUsername" },
           "/ --e s/password_here/", { "Ref" : "DBPassword" },

diff --git a/templates/WordPress_Single_Instance_With_IHA.template b/templates/WordPress_Single_Instance_With_IHA.template
index 7f715caa92c6d0500f4ba9e3beb7e9917c74237c..132bd380ce9ff9d3a9ff91d8a6676479f75a0fe5 100644 (file)
--- a/templates/WordPress_Single_Instance_With_IHA.template
+++ b/templates/WordPress_Single_Instance_With_IHA.template
@@ -229,6 +229,7 @@
           "' < /tmp/setup.mysql || error_exit 'Failed to create database.'\n",
 
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" },
           "/ --e s/username_here/", { "Ref" : "DBUsername" },
           "/ --e s/password_here/", { "Ref" : "DBPassword" },

diff --git a/templates/WordPress_Single_Instance_With_Quantum.template b/templates/WordPress_Single_Instance_With_Quantum.template
index 04a9c37e8f0e2dc6ea326ac9ca1a8b5e9b3f9119..049dfbe8acea40c18eb5b5ed8430511de9fb2614 100644 (file)
--- a/templates/WordPress_Single_Instance_With_Quantum.template
+++ b/templates/WordPress_Single_Instance_With_Quantum.template
@@ -172,6 +172,7 @@
           "EXIT\n",
           "EOF\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "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",
           "systemctl restart httpd.service\n"
         ]]}}

diff --git a/templates/WordPress_Single_Instance_gold.template b/templates/WordPress_Single_Instance_gold.template
index f7690b743434faf312d81f13e073d0935dabacf3..c520545338fb2cede8ec23e6433c9695a4486dda 100644 (file)
--- a/templates/WordPress_Single_Instance_gold.template
+++ b/templates/WordPress_Single_Instance_gold.template
@@ -133,6 +133,7 @@
           "EOF\n",
           "cat /tmp/mysql-wordpress-config | mysql -u root --password='", { "Ref" : "DBRootPassword" }, "' < /tmp/mysql-wordpress-config\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "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",
           "cp /usr/share/wordpress/wp-config.php /usr/share/wordpress/wp-config.orig\n"
         ]]}}

diff --git a/templates/WordPress_With_LB.template b/templates/WordPress_With_LB.template
index 7616779cc2df7628512542a8dc64a93162184d7d..df37dd8c988a4b8035284f06b1ceb9445e20b9c6 100644 (file)
--- a/templates/WordPress_With_LB.template
+++ b/templates/WordPress_With_LB.template
@@ -137,6 +137,7 @@
           "#!/bin/bash -v\n",
           "/opt/aws/bin/cfn-init\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "sed --in-place --e s/database_name_here/", { "Ref": "DBName" },
           "/ --e s/username_here/", { "Ref": "DBUsername" },
           "/ --e s/password_here/", { "Ref": "DBPassword" },

diff --git a/templates/WordPress_With_RDS.template b/templates/WordPress_With_RDS.template
index 9884e88d7f99bd63b07ecc5d6339b1a3927f1a22..d8a917e93b084b6ccef12341accceb70af6faef9 100644 (file)
--- a/templates/WordPress_With_RDS.template
+++ b/templates/WordPress_With_RDS.template
@@ -152,6 +152,7 @@
           "#!/bin/bash -v\n",
           "/opt/aws/bin/cfn-init\n",
           "sed -i \"/Deny from All/d\" /etc/httpd/conf.d/wordpress.conf\n",
+          "sed -i \"s/Require local/Require all granted/\" /etc/httpd/conf.d/wordpress.conf\n",
           "sed --in-place --e s/database_name_here/", { "Ref" : "DBName" }, "/ --e s/username_here/", { "Ref" : "DBUsername" }, "/ --e s/password_here/", { "Ref" : "DBPassword" }, "/ --e s/localhost/", { "Fn::GetAtt" : [ "DatabaseServer", "Endpoint.Address" ]}, "/ /usr/share/wordpress/wp-config.php\n",
           "systemctl restart httpd.service\n"
         ]]}}