s3_website 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38040b21ec9c146a9fded6561fb1157a183f7328
-  data.tar.gz: 5a5b95aa468aff45052775d45fbcdf2d9be6673d
+  metadata.gz: 092f7440dce07a7188fa3c262eb670ee1ce3fcfa
+  data.tar.gz: f33f91a77cebaefdfd7cb37783184a210ab06222
 SHA512:
-  metadata.gz: 8f4a9252e3c1c05f14a103e000e320d2a8045d38d17e7ecbd4bf663ce0e973baf8091257df8d7101dcfaf3489b08d366c76120f7d6ce14c294c0cb2694514a1a
-  data.tar.gz: e9884f5c0b07daf658c36c4665c3b9e1990e3509726746cd85ea11bb2a7e014b78234829982c0d74461a3f1ccafb0e1adfc5bddad8d0e0288f6e48ea9e453cd2
+  metadata.gz: fb3f83a880087f6b7f71ac89fdfe356db8c53e28c9f8b899b8bf4da8d96d1f8df4f0001af67e487d8fbee995a9c7dd4a4a5bbaac2f2b3fadee804c80b287c3df
+  data.tar.gz: f25b7a9f0d394497adfd2af1b672fcefc1514d739547a2bba2b83ed68b34984cf837552b457abf293f85f61f6dec46d95e3763118c7675ffdf3ab209b47c4c1f

data/README.md

@@ -429,6 +429,8 @@ Contributors (in alphabetical order)
 * Philip I. Thomas
 * Philippe Creux
 * Piotr Janik
+* Rodrigo Reis
+* Ross Hunter
 * Shigeaki Matsumura
 * stanislas
 * Tate Johnson

data/additional-docs/example-configurations.md

@@ -44,6 +44,28 @@ environment variables. It's convenient, since you can keep the `s3_website.yml`
 in a public Git repo, and thus have your deployment configurations
 version-controlled.
 
+Sometimes you want to use multiple CNAMEs aliases in your CloudFront distribution:
+
+````yaml
+s3_id: <%= ENV['your_domain_net_aws_key'] %>
+s3_secret: <%= ENV['your_domain_net_aws_secret'] %>
+s3_bucket: your.domain.net
+cloudfront_distribution_id: <%= ENV['your_domain_net_cloudfront_distribution_id'] %>
+cloudfront_distribution_config:
+  default_cache_behavior:
+    min_TTL: <%= 60 * 60 * 24 %>
+  aliases:
+    quantity: 3
+    items:
+      CNAME0: your1.domain.net
+      CNAME1: your2.domain.net
+      CNAME2: your3.domain.net
+max_age: 120
+gzip: true
+````
+
+Always remember to set the 'quantity' property to match the number of items you have.
+
 ## Using redirects
 
 ````yaml

data/bin/s3_website

@@ -33,6 +33,12 @@ class Cfg < Thor
     :type => :boolean,
     :desc => "When used with --headless, automatically create a CloudFront distribution for your S3 website."
   )
+  option(
+    'config-dir',
+    :type => :string,
+    :desc => "The directory where your config file is. When not defined, s3_website will look in the current working directory.",
+    :default => "."
+  )
   desc 'apply', 'Apply the configuration on the AWS services'
   long_desc <<-LONGDESC
     `s3_website cfg apply` will apply the configuration the S3 bucket.
@@ -45,7 +51,7 @@ class Cfg < Thor
   def apply
     puts 'Applying the configurations in s3_website.yml on the AWS services ...'
     require 'configure-s3-website'
-    config_source = ConfigureS3Website::FileConfigSource.new 's3_website.yml'
+    config_source = ConfigureS3Website::FileConfigSource.new "#{options['config-dir']}/s3_website.yml"
     ConfigureS3Website::Runner.run({
       :config_source => config_source,
       :headless => options[:headless],

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.6.0
+
+* Support `--config-dir` in `cfg apply`
+
 ## 2.5.1
 
 * Print **Would have updated|redirected|created** when running with `--dry-run`

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.5.1'
+  VERSION = '2.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor