spec/dslh_spec.rb in dslh-0.4.10 vs spec/dslh_spec.rb in dslh-0.4.11

- old
+ new

@@ -989,11 +989,12 @@ "m3.2xlarge"=>{"Arch"=>"64"}, "c1.medium"=>{"Arch"=>"64"}, "c1.xlarge"=>{"Arch"=>"64"}, "cc1.4xlarge"=>{"Arch"=>"64HVM"}, "cc2.8xlarge"=>{"Arch"=>"64HVM"}, - "cg1.4xlarge"=>{"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"}, @@ -1006,11 +1007,12 @@ "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"}}) + {"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}} + ) end Resources do S3Bucket do Type "AWS::S3::Bucket" DeletionPolicy "Retain" @@ -1141,16 +1143,18 @@ "fuse"=>[], "fuse-devel"=>[], "libcurl-devel"=>[], "libxml2-devel"=>[], "openssl-devel"=>[], - "mailcap"=>[]}) + "mailcap"=>[]} + ) end 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"}) + "/home/ec2-user/s3fs"=>"http://s3fs.googlecode.com/files/s3fs-1.61.tar.gz"} + ) files( {"/etc/passwd-s3fs"=> {"content"=> {"Fn::Join"=> ["", @@ -1201,11 +1205,12 @@ "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"}}) + "group"=>"root"}} + ) services do sysvinit do httpd do enabled "true" ensureRunning "true" @@ -1608,11 +1613,12 @@ "m3.2xlarge"=>{"Arch"=>"64"}, "c1.medium"=>{"Arch"=>"64"}, "c1.xlarge"=>{"Arch"=>"64"}, "cc1.4xlarge"=>{"Arch"=>"64HVM"}, "cc2.8xlarge"=>{"Arch"=>"64HVM"}, - "cg1.4xlarge"=>{"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"}, @@ -1625,11 +1631,12 @@ "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"}}) + {"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}} + ) end Resources do S3Bucket do Type "AWS::S3::Bucket" DeletionPolicy "Retain" @@ -1760,11 +1767,12 @@ "fuse"=>[], "fuse-devel"=>[], "libcurl-devel"=>[], "libxml2-devel"=>[], "openssl-devel"=>[], - "mailcap"=>[]}) + "mailcap"=>[]} + ) end sources do _path "/var/www/html", "http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz" _path "/home/ec2-user", "http://ftp.drupal.org/files/projects/drush-7.x-4.5.tar.gz" _path "/home/ec2-user/s3fs", "http://s3fs.googlecode.com/files/s3fs-1.61.tar.gz" @@ -2233,11 +2241,12 @@ "m3.2xlarge"=>{"Arch"=>"64"}, "c1.medium"=>{"Arch"=>"64"}, "c1.xlarge"=>{"Arch"=>"64"}, "cc1.4xlarge"=>{"Arch"=>"64HVM"}, "cc2.8xlarge"=>{"Arch"=>"64HVM"}, - "cg1.4xlarge"=>{"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"}, @@ -2250,11 +2259,12 @@ "ap-southeast-2"=> {"32"=>"ami-b3990e89", "64"=>"ami-bd990e87", "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"}}) + {"32"=>"ami-f836e8e5", "64"=>"ami-fe36e8e3", "64HVM"=>"NOT_YET_SUPPORTED"}} + ) end Resources do WebServer do Type "AWS::EC2::Instance" Metadata do @@ -2269,10 +2279,11 @@ "php-xml"=>[], "php-mbstring"=>[], "mysql"=>[], "mysql-server"=>[], "mysql-devel"=>[], - "mysql-libs"=>[]}) + "mysql-libs"=>[]} + ) end sources do _path "/var/www/html", "http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz" _path "/home/ec2-user", "http://ftp.drupal.org/files/projects/drush-7.x-4.5.tar.gz" end