Adds region

SumOfUs · Jan 16, 2017 · 7892944 · 7892944
1 parent ef5d4b4
commit 7892944
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/circle.yml b/circle.yml
@@ -45,7 +45,7 @@ deployment:
       - ./bin/build.sh
       - ./bin/deploy.sh $CIRCLE_SHA1 'champaign' 'env-production' 'champaign-assets-production' 'logs3.papertrailapp.com:44107' 'actions.sumofus.org'
   staging:
-    branch: update.paperclip
+    branch: development
     commands:
       - ./bin/build.sh
       - ./bin/deploy.sh $CIRCLE_SHA1 'champaign' 'champaign-staging' 'champaign-assets-staging' 'logs3.papertrailapp.com:34848' 'action-staging.sumofus.org'

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -93,6 +93,7 @@
 
   config.paperclip_defaults = {
     storage: :s3,
+    s3_region: Settings.aws_region,
     s3_host_name: Settings.s3_host_name,
     s3_host_alias: Settings.cloudfront_url,
     s3_protocol: 'https',