finalize config

Author: aklkv

config/deploy.js

@@ -2,7 +2,9 @@
 
 module.exports = function(deployTarget) {
   var ENV = {
-    build: {},
+    build: {
+      environment: 'production'
+    },
     pipeline: {
       // This setting runs the ember-cli-deploy activation hooks on every deploy
       // which is necessary in order to run ember-cli-deploy-cloudfront.
@@ -14,7 +16,8 @@ module.exports = function(deployTarget) {
     s3: {
       accessKeyId: process.env.AWS_KEY,
       secretAccessKey: process.env.AWS_SECRET,
-      filePattern: "*"
+      filePattern: "*",
+      cacheControl: 'max-age=0, no-cache, public'
     },
     cloudfront: {
       accessKeyId: process.env.AWS_KEY,
@@ -27,20 +30,23 @@ module.exports = function(deployTarget) {
     ENV.s3.bucket = process.env.DEVELOPMENT_BUCKET;
     ENV.s3.region = process.env.DEVELOPMENT_REGION;
     ENV.cloudfront.distribution = process.env.DEVELOPMENT_DISTRIBUTION;
+    ENV.pipeline.activateOnDeploy = false;
   }
 
   if (deployTarget === 'staging') {
     ENV.build.environment = 'production';
     ENV.s3.bucket = process.env.STAGING_BUCKET;
     ENV.s3.region = process.env.STAGING_REGION;
     ENV.cloudfront.distribution = process.env.STAGING_DISTRIBUTION;
+    ENV.pipeline.activateOnDeploy = false;
   }
 
   if (deployTarget === 'production') {
     ENV.build.environment = 'production';
     ENV.s3.bucket = process.env.PRODUCTION_BUCKET;
     ENV.s3.region = process.env.PRODUCTION_REGION;
     ENV.cloudfront.distribution = process.env.PRODUCTION_DISTRIBUTION;
+    ENV.pipeline.activateOnDeploy = false;
   }
 
   // Note: if you need to build some configuration asynchronously, you can return

config/environment.js

@@ -1,9 +1,10 @@
 /* jshint node: true */
 
 module.exports = function(environment) {
+  var deployTarget = process.env.DEPLOY_TARGET;
   var ENV = {
     modulePrefix: 'emberjs-talk-example',
-    environment: environment,
+    environment: deployTarget,
     baseURL: '/',
     locationType: 'auto',
     EmberENV: {
@@ -39,8 +40,12 @@ module.exports = function(environment) {
     ENV.APP.rootElement = '#ember-testing';
   }
 
-  if (environment === 'production') {
+  if (deployTarget === 'staging') {
+    ENV.buildEnv = 'production';
+  }
 
+  if (deployTarget === 'production') {
+    ENV.buildEnv = 'production';
   }
 
   return ENV;