Просмотр исходного кода

set NODE_TLS_REJECT_UNAUTHORIZED to 0 for testing
allows us to talk to staging sixpack

Henry Oswald 11 лет назад
Родитель
Сommit
49e6f4db87
2 измененных файлов с 10 добавлено и 2 удалено
  1. 8 1
      services/web/Gruntfile.coffee
  2. 2 1
      services/web/package.json

+ 8 - 1
services/web/Gruntfile.coffee

@@ -12,6 +12,8 @@ module.exports = (grunt) ->
 	grunt.loadNpmTasks 'grunt-sed'
 	grunt.loadNpmTasks 'grunt-sed'
 	grunt.loadNpmTasks 'grunt-git-rev-parse'
 	grunt.loadNpmTasks 'grunt-git-rev-parse'
 	grunt.loadNpmTasks 'grunt-file-append'
 	grunt.loadNpmTasks 'grunt-file-append'
+	grunt.loadNpmTasks 'grunt-file-append'
+	grunt.loadNpmTasks 'grunt-env'
 
 
 	config =
 	config =
 		execute:
 		execute:
@@ -74,6 +76,11 @@ module.exports = (grunt) ->
 				files:
 				files:
 					"public/stylesheets/style.css": "public/stylesheets/style.less"
 					"public/stylesheets/style.css": "public/stylesheets/style.less"
 
 
+		env:
+			run:
+				add: 
+					NODE_TLS_REJECT_UNAUTHORIZED:0
+
 		requirejs:
 		requirejs:
 			compile:
 			compile:
 				options:
 				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 '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 'default', 'run'
 
 
 	grunt.registerTask 'version', "Write the version number into sentry.jade", ['git-rev-parse', 'sed']
 	grunt.registerTask 'version', "Write the version number into sentry.jade", ['git-rev-parse', 'sed']

+ 2 - 1
services/web/package.json

@@ -73,6 +73,7 @@
     "grunt-sed": "^0.1.1",
     "grunt-sed": "^0.1.1",
     "sandboxed-module": "0.2.0",
     "sandboxed-module": "0.2.0",
     "sinon": "",
     "sinon": "",
-    "timekeeper": ""
+    "timekeeper": "",
+    "grunt-env":"0.4.4"
   }
   }
 }
 }