dslh 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22c5f3ef5ed8d62be6f01f66185d03c69746a21f
-  data.tar.gz: 07f1988d59dd1f91dde43e9dcc7b9412122dc3b0
+  metadata.gz: 041bb7cf886d6a16fb6be02ba6ef356bf31810c7
+  data.tar.gz: b96cb8ee97322d53745dda628eca4e8fe6ace944
 SHA512:
-  metadata.gz: 7c6d12ec8eed101cd59bf56c8bf452086c224196428f38275769bc89ef688c3db64f120d907b3d9737542e379c4ec33bac13dd512a9b5c3e301aab0d38637090
-  data.tar.gz: 4278f2189e6ca73c321b5d341835b4e6e0b645f337ca288ad016481bf90f241f27fe2129fb207866c08c61b5f4b9d85490bc3ec739258373c8d1b90415b2ca68
+  metadata.gz: 6753cfa8efa4438bcdfb2193bb827c4268c65bef24f302d2494c759047de84442d3b318dc79871e013214641aca7e19e99e0c102e9256c53eb47fd8dab069d0a
+  data.tar.gz: 7d43a7ca6c3633460e47e5251dbadcb7336f7f6e342965bda4404737c2426fc9fe17125d718b221de5b33860bd6c36c706670282da265e5dfd46c0fcb93b8e8c

data/lib/dslh.rb

@@ -76,6 +76,7 @@ class Dslh
     next_indent = (INDENT_SPACES * (depth + 1))
     key_conv = @options[:key_conv] || @options[:conv]
     value_conv = @options[:value_conv] || @options[:conv]
+    nested = false
 
     if exclude_key?(key_conv, hash.keys)
       buf.puts('(' + ("\n" + hash.pretty_inspect.strip).gsub("\n", "\n" + indent) + ')')
@@ -83,86 +84,96 @@ class Dslh
     end
 
     hash.each do |key, value|
-      key = key_conv.call(key) if key_conv
-      buf.print(indent + key)
+      value_proc = proc do |value_buf|
+        case value
+        when Hash
+          if exclude_key?(key_conv, value.keys)
+            value_buf.puts('(' + ("\n" + value.pretty_inspect.strip).gsub("\n", "\n" + next_indent) + ')')
+          else
+            nested = true
+            value_buf.puts(' do')
+            deval0(value, depth + 1, value_buf)
+            value_buf.puts(indent + 'end')
+          end
+        when Array
+          if value.any? {|v| [Array, Hash].any? {|c| v.kind_of?(c) }}
+            nested = true
+            value_buf.puts(' [')
+
+            value.each_with_index do |v, i|
+              if v.kind_of?(Hash)
+                value_buf.puts(next_indent + '_{')
+                deval0(v, depth + 2, value_buf)
+                value_buf.print(next_indent + '}')
+              else
+                value_buf.print(next_indent + v.pretty_inspect.strip.gsub("\n", "\n" + next_indent))
+              end
+
+              value_buf.puts(i < (value.length - 1) ? ',' : '')
+            end
 
-      case value
-      when Hash
-        if exclude_key?(key_conv, value.keys)
-          buf.puts('(' + ("\n" + value.pretty_inspect.strip).gsub("\n", "\n" + next_indent) + ')')
+            value_buf.puts(indent + ']')
+          elsif value.length == 1
+            value_buf.puts(' ' + value.inspect)
+          else
+            value_buf.puts(' ' + value.map {|v|
+              v = value_conv.call(v) if value_conv
+
+              if v.kind_of?(Hash)
+                '(' + v.inspect + ')'
+              else
+                v.inspect
+              end
+            }.join(', '))
+          end
         else
-          buf.puts(' do')
-          deval0(value, depth + 1, buf)
-          buf.puts(indent + 'end')
+          value = value_conv.call(value) if value_conv
+          value_buf.puts(' ' + value.inspect)
         end
-      when Array
-        if value.any? {|v| [Array, Hash].any? {|c| v.kind_of?(c) }}
-          buf.puts(' [')
-
-          value.each_with_index do |v, i|
-            if v.kind_of?(Hash)
-              buf.puts(next_indent + '_{')
-              deval0(v, depth + 2, buf)
-              buf.print(next_indent + '}')
-            else
-              buf.print(next_indent + v.pretty_inspect.strip.gsub("\n", "\n" + next_indent))
-            end
+      end
 
-            buf.puts(i < (value.length - 1) ? ',' : '')
-          end
+      key = key_conv.call(key) if key_conv
 
-          buf.puts(indent + ']')
-        elsif value.length == 1
-          buf.puts(' ' + value.inspect)
-        else
-          buf.puts(' ' + value.map {|v|
-            v = value_conv.call(v) if value_conv
+      if key.kind_of?(Proc)
+        tmp_buf = StringIO.new
+        value_proc.call(tmp_buf)
 
-            if v.kind_of?(Hash)
-              '(' + v.inspect + ')'
-            else
-              v.inspect
-            end
-          }.join(', '))
-        end
+        key_value = case key.arity
+                    when 0
+                      key.call
+                    when 1
+                      key.call(tmp_buf.string.strip)
+                    else
+                      key.call(tmp_buf.string.strip, nested)
+                    end
+
+        buf.puts(indent + key_value)
       else
-        value = value_conv.call(value) if value_conv
-        buf.puts(' ' + value.inspect)
+        buf.print(indent + key)
+        value_proc.call(buf)
       end
     end
   end
 
   def exclude_key?(key_conv, keys)
     exclude_key = @options[:exclude_key] || proc {|k| k.to_s !~ /\A[_a-z]\w+\Z/i }
-    exclude_key and (key_conv ? keys.map {|k| key_conv.call(k) } : keys).any? {|k| exclude_key.call(k) }
+
+    if not @options.has_key?(:exclude_key) and key_conv
+      keys = keys.map {|k| key_conv.call(k) }
+    end
+
+    keys.any? {|k| exclude_key.call(k) }
   end
 
   class Scope
     def _(&block)
-      if block
-        hash_orig = @__hash__
-        @__hash__ = {}
-        self.instance_eval(&block)
-        nested_hash = @__hash__
-        @__hash__ = hash_orig
-        return nested_hash
-      end
+      ScopeBlock.nest(binding, 'block')
     end
 
     def method_missing(method_name, *args, &block)
       key_conv = @__options__[:key_conv] || @__options__[:conv]
       value_conv = @__options__[:value_conv] || @__options__[:conv]
-
-      nested_hash = nil
-
-      if block
-        hash_orig = @__hash__
-        @__hash__ = {}
-        self.instance_eval(&block)
-        nested_hash = @__hash__
-        @__hash__ = hash_orig
-      end
-
+      nested_hash = ScopeBlock.nest(binding, 'block')
       method_name = key_conv.call(method_name) if key_conv
 
       if args.empty?
@@ -183,4 +194,21 @@ class Dslh
       end
     end
   end # of Scope
+
+  class ScopeBlock
+    def self.nest(bind, block_var)
+      eval(<<-EOS, bind)
+        if #{block_var}
+          __hash_orig = @__hash__
+          @__hash__ = {}
+          self.instance_eval(&#{block_var})
+          __nested_hash = @__hash__
+          @__hash__ = __hash_orig
+          __nested_hash
+        else
+          nil
+        end
+      EOS
+    end
+  end
 end

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/spec/Drupal_Multi_AZ.template

@@ -0,0 +1,455 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+
+  "Description" : "AWS CloudFormation Sample Template Drupal_Multi_AZ. Drupal is an open source content management platform powering millions of websites and applications. This template installs a highly-available, scalable Drupal deployment using a multi-az Amazon RDS database instance for storage. It uses the AWS CloudFormation bootstrap scripts to install packages and files at instance launch time. **WARNING** This template creates one or more Amazon EC2 instances, an Elastic Load Balancer and an Amazon RDS database. You will be billed for the AWS resources used if you create a stack from this template.",
+
+  "Parameters" : {
+
+    "KeyName": {
+      "Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
+      "Type": "String",
+      "MinLength": "1",
+      "MaxLength": "255",
+      "AllowedPattern" : "[\\x20-\\x7E]*",
+      "ConstraintDescription" : "can contain only ASCII characters."
+    },
+
+    "InstanceType" : {
+      "Description" : "WebServer EC2 instance type",
+      "Type" : "String",
+      "Default" : "m1.small",
+      "ConstraintDescription" : "must be a valid EC2 instance type."
+    },
+
+    "SiteName": {
+      "Default": "My Site",
+      "Description" : "The name of the Drupal Site",
+      "Type": "String"
+    },
+
+    "SiteEMail": {
+      "Description" : "EMail for site adminitrator",
+      "Type": "String"
+    },
+
+    "SiteAdmin": {
+      "Description" : "The Drupal site admin account username",
+      "Type": "String",
+      "MinLength": "1",
+      "MaxLength": "16",
+      "AllowedPattern" : "[a-zA-Z][a-zA-Z0-9]*",
+      "ConstraintDescription" : "must begin with a letter and contain only alphanumeric characters."
+    },
+
+    "SitePassword": {
+      "NoEcho": "true",
+      "Description" : "The Drupal site admin account password",
+      "Type": "String",
+      "MinLength": "1",
+      "MaxLength": "41",
+      "AllowedPattern" : "[a-zA-Z0-9]*",
+      "ConstraintDescription" : "must contain only alphanumeric characters."
+    },
+
+    "DBName": {
+      "Default": "drupaldb",
+      "Description" : "The Drupal database name",
+      "Type": "String",
+      "MinLength": "1",
+      "MaxLength": "64",
+      "AllowedPattern" : "[a-zA-Z][a-zA-Z0-9]*",
+      "ConstraintDescription" : "must begin with a letter and contain only alphanumeric characters."
+    },
+
+    "DBUsername": {
+      "Default": "admin",
+      "NoEcho": "true",
+      "Description" : "The Drupal database admin account username",
+      "Type": "String",
+      "MinLength": "1",
+      "MaxLength": "16",
+      "AllowedPattern" : "[a-zA-Z][a-zA-Z0-9]*",
+      "ConstraintDescription" : "must begin with a letter and contain only alphanumeric characters."
+    },
+
+    "DBPassword": {
+      "Default": "password",
+      "NoEcho": "true",
+      "Description" : "The Drupal database admin account password",
+      "Type": "String",
+      "MinLength": "8",
+      "MaxLength": "41",
+      "AllowedPattern" : "[a-zA-Z0-9]*",
+      "ConstraintDescription" : "must contain only alphanumeric characters."
+    },
+
+    "DBClass" : {
+      "Default" : "db.m1.small",
+      "Description" : "Database instance class",
+      "Type" : "String",
+      "AllowedValues" : [ "db.m1.small", "db.m1.large", "db.m1.xlarge", "db.m2.xlarge", "db.m2.2xlarge", "db.m2.4xlarge" ],
+      "ConstraintDescription" : "must select a valid database instance type."
+    },
+
+    "DBAllocatedStorage" : {
+      "Default": "5",
+      "Description" : "The size of the database (Gb)",
+      "Type": "Number",
+      "MinValue": "5",
+      "MaxValue": "1024",
+      "ConstraintDescription" : "must be between 5 and 1024Gb."
+    },
+
+    "MultiAZDatabase": {
+      "Default": "true",
+      "Description" : "Create a multi-AZ MySQL Amazon RDS database instance",
+      "Type": "String",
+      "AllowedValues" : [ "true", "false" ],
+      "ConstraintDescription" : "must be either true or false."
+    },
+
+    "WebServerCapacity": {
+      "Default": "2",
+      "Description" : "The initial number of WebServer instances",
+      "Type": "Number",
+      "MinValue": "1",
+      "MaxValue": "5",
+      "ConstraintDescription" : "must be between 1 and 5 EC2 instances."
+    },
+    "SSHLocation" : {
+      "Description" : "The IP address range that can be used to SSH to the EC2 instances",
+      "Type": "String",
+      "MinLength": "9",
+      "MaxLength": "18",
+      "Default": "0.0.0.0/0",
+      "AllowedPattern": "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})",
+      "ConstraintDescription": "must be a valid IP CIDR range of the form x.x.x.x/x."
+   }
+  },
+
+  "Mappings" : {
+    "AWSInstanceType2Arch" : {
+      "t1.micro"    : { "Arch" : "64" },
+      "m1.small"    : { "Arch" : "64" },
+      "m1.medium"   : { "Arch" : "64" },
+      "m1.large"    : { "Arch" : "64" },
+      "m1.xlarge"   : { "Arch" : "64" },
+      "m2.xlarge"   : { "Arch" : "64" },
+      "m2.2xlarge"  : { "Arch" : "64" },
+      "m2.4xlarge"  : { "Arch" : "64" },
+      "m3.xlarge"   : { "Arch" : "64" },
+      "m3.2xlarge"  : { "Arch" : "64" },
+      "c1.medium"   : { "Arch" : "64" },
+      "c1.xlarge"   : { "Arch" : "64" },
+      "cc1.4xlarge" : { "Arch" : "64HVM" },
+      "cc2.8xlarge" : { "Arch" : "64HVM" },
+      "cg1.4xlarge" : { "Arch" : "64HVM" }
+    },
+
+    "AWSRegionArch2AMI" : {
+      "us-east-1"      : { "32" : "ami-a0cd60c9", "64" : "ami-aecd60c7", "64HVM" : "ami-a8cd60c1" },
+      "us-west-2"      : { "32" : "ami-46da5576", "64" : "ami-48da5578", "64HVM" : "NOT_YET_SUPPORTED" },
+      "us-west-1"      : { "32" : "ami-7d4c6938", "64" : "ami-734c6936", "64HVM" : "NOT_YET_SUPPORTED" },
+      "eu-west-1"      : { "32" : "ami-61555115", "64" : "ami-6d555119", "64HVM" : "ami-67555113" },
+      "ap-southeast-1" : { "32" : "ami-220b4a70", "64" : "ami-3c0b4a6e", "64HVM" : "NOT_YET_SUPPORTED" },
+      "ap-southeast-2" : { "32" : "ami-8f990eb5", "64" : "ami-95990eaf", "64HVM" : "NOT_YET_SUPPORTED" },
+      "ap-northeast-1" : { "32" : "ami-2a19aa2b", "64" : "ami-2819aa29", "64HVM" : "NOT_YET_SUPPORTED" },
+      "sa-east-1"      : { "32" : "ami-f836e8e5", "64" : "ami-fe36e8e3", "64HVM" : "NOT_YET_SUPPORTED" }
+    }
+  },
+
+  "Resources" : {
+
+    "S3Bucket" : {
+      "Type" : "AWS::S3::Bucket",
+      "DeletionPolicy" : "Retain"
+    },
+
+    "BucketPolicy" : {
+      "Type" : "AWS::S3::BucketPolicy",
+      "Properties" : {
+        "PolicyDocument": {
+          "Version"      : "2008-10-17",
+          "Id"           : "UploadPolicy",
+          "Statement"    : [{
+            "Sid"        : "EnableReadWrite",
+            "Action"     : ["s3:GetObject", "s3:PutObject", "s3:PutObjectACL" ],
+            "Effect"     : "Allow",
+            "Resource"   : { "Fn::Join" : ["", ["arn:aws:s3:::", {"Ref" : "S3Bucket"} , "/*"]]},
+            "Principal"  : { "AWS": {"Fn::GetAtt" : ["S3User", "Arn"]} }
+          }]
+        },
+        "Bucket" : {"Ref" : "S3Bucket"}
+      }
+    },
+
+    "S3User" : {
+      "Type" : "AWS::IAM::User",
+      "Properties" : {
+        "Path": "/",
+        "Policies": [{
+          "PolicyName": "root",
+          "PolicyDocument": { "Statement":[{
+            "Effect":"Allow",
+            "Action":"s3:*",
+            "Resource":"*"
+          }]}
+        }]
+      }
+    },
+
+    "S3Keys" : {
+      "Type" : "AWS::IAM::AccessKey",
+      "Properties" : {
+        "UserName" : {"Ref": "S3User"}
+      }
+    },
+
+    "ElasticLoadBalancer" : {
+      "Type" : "AWS::ElasticLoadBalancing::LoadBalancer",
+      "Metadata" : {
+        "Comment" : "Configure the Load Balancer with a simple health check and cookie-based stickiness"
+      },
+      "Properties" : {
+        "AvailabilityZones" : { "Fn::GetAZs" : "" },
+        "LBCookieStickinessPolicy" : [ {
+          "PolicyName" : "CookieBasedPolicy",
+          "CookieExpirationPeriod" : "30"
+        } ],
+        "Listeners" : [ {
+          "LoadBalancerPort" : "80",
+          "InstancePort" : "80",
+          "Protocol" : "HTTP",
+          "PolicyNames" : [ "CookieBasedPolicy" ]
+        } ],
+        "HealthCheck" : {
+          "Target" : "HTTP:80/",
+          "HealthyThreshold" : "2",
+          "UnhealthyThreshold" : "5",
+          "Interval" : "10",
+          "Timeout" : "5"
+        }
+      }
+    },
+
+    "WebServerGroup" : {
+      "Type" : "AWS::AutoScaling::AutoScalingGroup",
+      "Properties" : {
+        "AvailabilityZones" : { "Fn::GetAZs" : "" },
+        "LaunchConfigurationName" : { "Ref" : "LaunchConfig" },
+        "MinSize" : "1",
+        "MaxSize" : "5",
+        "DesiredCapacity" : { "Ref" : "WebServerCapacity" },
+        "LoadBalancerNames" : [ { "Ref" : "ElasticLoadBalancer" } ]
+      }
+    },
+
+    "LaunchConfig": {
+      "Type" : "AWS::AutoScaling::LaunchConfiguration",
+      "Metadata" : {
+        "AWS::CloudFormation::Init" : {
+          "config" : {
+            "packages" : {
+              "yum" : {
+                "httpd"           : [],
+                "php"             : [],
+                "php-mysql"       : [],
+                "php-gd"          : [],
+                "php-xml"         : [],
+                "php-mbstring"    : [],
+                "mysql"           : [],
+                "gcc"             : [],
+                "make"            : [],
+                "libstdc++-devel" : [],
+                "gcc-c++"         : [],
+                "fuse"            : [],
+                "fuse-devel"      : [],
+                "libcurl-devel"   : [],
+                "libxml2-devel"   : [],
+                "openssl-devel"   : [],
+                "mailcap"         : []
+
+              }
+            },
+
+            "sources" : {
+              "/var/www/html"       : "http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz",
+              "/home/ec2-user"      : "http://ftp.drupal.org/files/projects/drush-7.x-4.5.tar.gz",
+              "/home/ec2-user/s3fs" : "http://s3fs.googlecode.com/files/s3fs-1.61.tar.gz"
+            },
+
+            "files" : {
+              "/etc/passwd-s3fs" : {
+                "content" : { "Fn::Join" : ["", [ { "Ref" : "S3Keys" }, ":", {"Fn::GetAtt": ["S3Keys", "SecretAccessKey"]}, "\n" ]]},
+                "mode"  : "000400",
+                "owner" : "root",
+                "group" : "root"
+              },
+
+              "/home/ec2-user/settings.php" : {
+                "content" : { "Fn::Join" : ["", [
+                  "<?php\n",
+                  "\n",
+                  "$databases = array (\n",
+                  "  'default' =>\n",
+                  "  array (\n",
+                  "    'default' =>\n",
+                  "    array (\n",
+                  "      'database' => '", { "Ref" : "DBName" }, "',\n",
+                  "      'username' => '", { "Ref" : "DBUsername" }, "',\n",
+                  "      'password' => '", { "Ref" : "DBPassword" }, "',\n",
+                  "      'host' => '", {"Fn::GetAtt" : ["DBInstance", "Endpoint.Address"]}, "',\n",
+                  "      'port' => '", {"Fn::GetAtt" : ["DBInstance", "Endpoint.Port"]}, "',\n",
+                  "      'driver' => 'mysql',\n",
+                  "      'prefix' => 'drupal_',\n",
+                  "    ),\n",
+                  "  ),\n",
+                  ");\n",
+                  "\n",
+                  "$update_free_access = FALSE;\n",
+                  "\n",
+                  "$drupal_hash_salt = '0c3R8noNALe3shsioQr5hK1dMHdwRfikLoSfqn0_xpA';\n",
+                  "\n",
+                  "ini_set('session.gc_probability', 1);\n",
+                  "ini_set('session.gc_divisor', 100);\n",
+                  "ini_set('session.gc_maxlifetime', 200000);\n",
+                  "ini_set('session.cookie_lifetime', 2000000);\n"
+                ]]},
+                "mode"  : "000400",
+                "owner" : "root",
+                "group" : "root"
+              }
+            },
+
+            "services" : {
+              "sysvinit" : {
+                "httpd"    : { "enabled" : "true", "ensureRunning" : "true" },
+                "sendmail" : { "enabled" : "false", "ensureRunning" : "false" }
+              }
+            }
+          }
+        }
+      },
+      "Properties": {
+        "ImageId" : { "Fn::FindInMap" : [ "AWSRegionArch2AMI", { "Ref" : "AWS::Region" },
+                          { "Fn::FindInMap" : [ "AWSInstanceType2Arch", { "Ref" : "InstanceType" }, "Arch" ] } ] },
+        "InstanceType"   : { "Ref" : "InstanceType" },
+        "SecurityGroups" : [ {"Ref" : "WebServerSecurityGroup"} ],
+        "KeyName"        : { "Ref" : "KeyName" },
+        "UserData"       : { "Fn::Base64" : { "Fn::Join" : ["", [
+          "#!/bin/bash -v\n",
+          "yum update -y aws-cfn-bootstrap\n",
+
+          "# Helper function\n",
+          "function error_exit\n",
+          "{\n",
+          "  /opt/aws/bin/cfn-signal -e 1 -r \"$1\" '", { "Ref" : "WaitHandle" }, "'\n",
+          "  exit 1\n",
+          "}\n",
+
+          "# Install Apache Web Server, MySQL and Drupal\n",
+          "/opt/aws/bin/cfn-init -s ", { "Ref" : "AWS::StackId" }, " -r LaunchConfig ",
+          "    --region ", { "Ref" : "AWS::Region" }, " || error_exit 'Failed to run cfn-init'\n",
+
+          "# Install s3fs\n",
+          "cd /home/ec2-user/s3fs/s3fs-1.61\n",
+          "./configure --prefix=/usr\n",
+          "make\n",
+          "make install\n",
+
+          "# Move the website files to the top level\n",
+          "mv /var/www/html/drupal-7.8/* /var/www/html\n",
+          "mv /var/www/html/drupal-7.8/.htaccess /var/www/html\n",
+          "rm -Rf /var/www/html/drupal-7.8\n",
+
+          "# Mount the S3 bucket\n",
+          "mv /var/www/html/sites/default/files /var/www/html/sites/default/files_original\n",
+          "mkdir -p /var/www/html/sites/default/files\n",
+          "s3fs -o allow_other -o use_cache=/tmp ", { "Ref" : "S3Bucket" } ," /var/www/html/sites/default/files || error_exit 'Failed to mount the S3 bucket'\n",
+          "echo `hostname` >> /var/www/html/sites/default/files/hosts\n",
+
+          "# Make changes to Apache Web Server configuration\n",
+          "sed -i 's/AllowOverride None/AllowOverride All/g'  /etc/httpd/conf/httpd.conf\n",
+          "service httpd restart\n",
+
+          "# Only execute the site install if we are the first host up - otherwise we'll end up losing all the data\n",
+          "read first < /var/www/html/sites/default/files/hosts\n",
+          "if [ `hostname` = $first ]\n",
+          "then\n",
+          "  # Create the site in Drupal\n",
+          "  cd /var/www/html\n",
+          "  ~ec2-user/drush/drush site-install standard --yes",
+          "     --site-name='", { "Ref" : "SiteName" }, "' --site-mail=", { "Ref" : "SiteEMail" },
+          "     --account-name=", { "Ref" : "SiteAdmin" }, " --account-pass=", { "Ref" : "SitePassword" },
+          "     --db-url=mysql://", { "Ref" : "DBUsername" }, ":", { "Ref" : "DBPassword" }, "@", {"Fn::GetAtt" : ["DBInstance", "Endpoint.Address"]}, ":", {"Fn::GetAtt" : ["DBInstance", "Endpoint.Port"]}, "/", { "Ref" : "DBName" },
+          "     --db-prefix=drupal_\n",
+          "  # use the S3 bucket for shared file storage\n",
+          "  cp -R sites/default/files_original/* sites/default/files\n",
+          "  cp -R sites/default/files_original/.htaccess sites/default/files\n",
+          "else\n",
+          "  # Copy settings.php file since everything else is configured\n",
+          "  cp /home/ec2-user/settings.php /var/www/html/sites/default\n",
+          "fi\n",
+          "rm /home/ec2-user/settings.php\n",
+
+          "# All is well so signal success\n",
+          "/opt/aws/bin/cfn-signal -e 0 -r \"Drupal setup complete\" '", { "Ref" : "WaitHandle" }, "'\n"
+
+        ]]}}
+      }
+    },
+
+    "WaitHandle" : {
+      "Type" : "AWS::CloudFormation::WaitConditionHandle"
+    },
+
+    "WaitCondition" : {
+      "Type" : "AWS::CloudFormation::WaitCondition",
+      "DependsOn" : "WebServerGroup",
+      "Properties" : {
+        "Handle" : {"Ref" : "WaitHandle"},
+        "Timeout" : "600"
+      }
+    },
+
+    "DBInstance" : {
+      "Type": "AWS::RDS::DBInstance",
+      "Properties": {
+        "DBName"            : { "Ref" : "DBName" },
+        "Engine"            : "MySQL",
+        "MultiAZ"           : { "Ref": "MultiAZDatabase" },
+        "MasterUsername"    : { "Ref" : "DBUsername" },
+        "DBInstanceClass"   : { "Ref" : "DBClass" },
+        "DBSecurityGroups"  : [{ "Ref" : "DBSecurityGroup" }],
+        "AllocatedStorage"  : { "Ref" : "DBAllocatedStorage" },
+        "MasterUserPassword": { "Ref" : "DBPassword" }
+      }
+    },
+
+    "DBSecurityGroup": {
+      "Type": "AWS::RDS::DBSecurityGroup",
+      "Properties": {
+        "DBSecurityGroupIngress": { "EC2SecurityGroupName": { "Ref": "WebServerSecurityGroup"} },
+        "GroupDescription"      : "Frontend Access"
+      }
+    },
+
+    "WebServerSecurityGroup" : {
+      "Type" : "AWS::EC2::SecurityGroup",
+      "Properties" : {
+        "GroupDescription" : "Enable HTTP access via port 80, locked down to requests from the load balancer only and SSH access",
+        "SecurityGroupIngress" : [
+          {"IpProtocol" : "tcp", "FromPort" : "80", "ToPort" : "80", "SourceSecurityGroupOwnerId" : {"Fn::GetAtt" : ["ElasticLoadBalancer", "SourceSecurityGroup.OwnerAlias"]},"SourceSecurityGroupName" : {"Fn::GetAtt" : ["ElasticLoadBalancer", "SourceSecurityGroup.GroupName"]}},
+          {"IpProtocol" : "tcp", "FromPort" : "22", "ToPort" : "22", "CidrIp" : { "Ref" : "SSHLocation"}}
+        ]
+      }
+    }
+  },
+
+  "Outputs" : {
+    "WebsiteURL" : {
+      "Value" : { "Fn::Join" : ["", ["http://", { "Fn::GetAtt" : [ "ElasticLoadBalancer", "DNSName" ]}]] },
+      "Description" : "Drupal Website"
+    }
+  }
+}