Hide passwords in log. Add mwater.org

mbriau · Mar 10, 2014 · 2e137a6 · 2e137a6
1 parent 435ccd4
commit 2e137a6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -171,12 +171,18 @@ module.exports = function(grunt) {
         }
       },
       deploy_map: {
-        command: 's3cmd sync --acl-public --guess-mime-type ' +
+        command: ['s3cmd sync --acl-public --guess-mime-type ' +
           '--add-header "Cache-Control: no-cache, must-revalidate" ' +
           '--add-header "Pragma: no-cache" ' +
           '--add-header "Expires: 0" ' + 
           '--add-header "Content-Encoding: gzip" '+
           '* s3://map.mwater.co',
+          's3cmd sync --acl-public --guess-mime-type ' +
+          '--add-header "Cache-Control: no-cache, must-revalidate" ' +
+          '--add-header "Pragma: no-cache" ' +
+          '--add-header "Expires: 0" ' + 
+          '--add-header "Content-Encoding: gzip" '+
+          '* s3://map.mwater.org']
         options: {
           stdout: true,
           execOptions: {
@@ -197,7 +203,19 @@ module.exports = function(grunt) {
           '--add-header "Pragma: no-cache" ' +
           '--add-header "Expires: 0" ' + 
           '--add-header "Content-Encoding: gzip" '+
-          'manifest.appcache s3://app.mwater.co'
+          'manifest.appcache s3://app.mwater.org',
+          's3cmd sync --acl-public --guess-mime-type ' +
+          '--add-header "Cache-Control: no-cache, must-revalidate" ' +
+          '--add-header "Pragma: no-cache" ' +
+          '--add-header "Expires: 0" ' + 
+          '--add-header "Content-Encoding: gzip" '+
+          '* s3://app.mwater.org',
+          's3cmd put --acl-public --guess-mime-type ' +
+          '--add-header "Cache-Control: no-cache, no-store, must-revalidate" ' +
+          '--add-header "Pragma: no-cache" ' +
+          '--add-header "Expires: 0" ' + 
+          '--add-header "Content-Encoding: gzip" '+
+          'manifest.appcache s3://app.mwater.org'
         ].join('&&'),
         options: {
           stdout: true,

diff --git a/app/js/pages/utils.coffee b/app/js/pages/utils.coffee
@@ -27,7 +27,7 @@ exports.changeUserOrgDocs = (db, user, org, success, error) ->
 
 
 exports.login = (username, password, ctx, success, error) ->
-  console.log "Logging in as: #{username}/#{password}"
+  console.log "Logging in as: #{username}/###"
 
   url = ctx.apiUrl + 'clients'
   req = $.ajax(url, {

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "repository": "",
+  "repository": "[email protected]:mWater/app-v3.git",
   "author": "Clayton Grassick",
   "license": "GPLv3",
   "devDependencies": {},