From 49e6f4db87fde402838c4b21701f9d2a79445be0 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Thu, 12 Nov 2015 12:38:35 +0000 Subject: [PATCH] set NODE_TLS_REJECT_UNAUTHORIZED to 0 for testing allows us to talk to staging sixpack --- services/web/Gruntfile.coffee | 9 ++++++++- services/web/package.json | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/services/web/Gruntfile.coffee b/services/web/Gruntfile.coffee index 9fe53b0115..ff80a82428 100644 --- a/services/web/Gruntfile.coffee +++ b/services/web/Gruntfile.coffee @@ -12,6 +12,8 @@ module.exports = (grunt) -> grunt.loadNpmTasks 'grunt-sed' grunt.loadNpmTasks 'grunt-git-rev-parse' grunt.loadNpmTasks 'grunt-file-append' + grunt.loadNpmTasks 'grunt-file-append' + grunt.loadNpmTasks 'grunt-env' config = execute: @@ -74,6 +76,11 @@ module.exports = (grunt) -> files: "public/stylesheets/style.css": "public/stylesheets/style.less" + env: + run: + add: + NODE_TLS_REJECT_UNAUTHORIZED:0 + requirejs: compile: options: @@ -294,7 +301,7 @@ module.exports = (grunt) -> grunt.registerTask 'test:modules:unit', 'Run the unit tests for the modules', ['compile:modules:server', 'compile:modules:unit_tests'].concat(moduleUnitTestTasks) - grunt.registerTask 'run', "Compile and run the web-sharelatex server", ['compile', 'bunyan', 'execute'] + grunt.registerTask 'run', "Compile and run the web-sharelatex server", ['compile', 'bunyan', 'env:run', 'execute'] grunt.registerTask 'default', 'run' grunt.registerTask 'version', "Write the version number into sentry.jade", ['git-rev-parse', 'sed'] diff --git a/services/web/package.json b/services/web/package.json index a866c1b50f..f7d0318ff4 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -73,6 +73,7 @@ "grunt-sed": "^0.1.1", "sandboxed-module": "0.2.0", "sinon": "", - "timekeeper": "" + "timekeeper": "", + "grunt-env":"0.4.4" } }