From c767ae664513a702982793a01d275245e0859602 Mon Sep 17 00:00:00 2001
From: Spencer Alger <spencer@spenceralger.com>
Date: Thu, 19 Sep 2013 08:09:04 -0700
Subject: [PATCH] moved the aws config out of the general gruntfile setup, and
 into a task that is only run when needed.

---
 Gruntfile.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 60eafc24b4f..57f8e4dc1c0 100755
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,7 +4,6 @@ module.exports = function (grunt) {
 
   var config = {
     pkg: grunt.file.readJSON('package.json'),
-    aws: grunt.file.readJSON('.aws-config.json'),
     srcDir: 'src',
     destDir: 'dist',
     tempDir: 'tmp',
@@ -170,12 +169,6 @@ module.exports = function (grunt) {
       }
     },
     s3: {
-      options: {
-        key: '<%= aws.key %>',
-        secret: '<%= aws.secret %>',
-        bucket: 'download.elasticsearch.org',
-        access: 'private'
-      },
       dist: {
         upload: [
           {
@@ -267,12 +260,23 @@ module.exports = function (grunt) {
   ]);
 
   grunt.registerTask('distribute', [
+    'load_s3_config',
     'build',
     'zip:dist',
     's3:dist',
     'clean:temp'
   ]);
 
+  grunt.registerTask('load_s3_config', function () {
+    var config = grunt.file.readJSON('.aws-config.json');
+    grunt.config('s3.options', {
+      key: config.key,
+      secret: config.secret,
+      bucket: 'download.elasticsearch.org',
+      access: 'private'
+    });
+  });
+
   grunt.registerTask('write_revision_to_dest', function() {
     grunt.event.once('git-describe', function (desc) {
       grunt.config('string-replace.config', {