Bläddra i källkod

Add options to serve via HTTPS

JC Brand 8 månader sedan
förälder
incheckning
eab4df2d7c
3 ändrade filer med 23 tillägg och 17 borttagningar
  1. 3 0
      .gitignore
  2. 19 17
      Makefile
  3. 1 0
      package.json

+ 3 - 0
.gitignore

@@ -1,6 +1,9 @@
 # Distribution directory
 # Distribution directory
 dist
 dist
 
 
+# TLS certificates
+certs
+
 # conversejs/media repo checkout
 # conversejs/media repo checkout
 media
 media
 
 

+ 19 - 17
Makefile

@@ -1,21 +1,22 @@
 # You can set these variables from the command line.
 # You can set these variables from the command line.
-BOOTSTRAP		= ./node_modules/
-BUILDDIR		= ./docs
-KARMA			?= ./node_modules/.bin/karma
-CLEANCSS		?= ./node_modules/clean-css-cli/bin/cleancss
-HTTPSERVE_PORT	?= 8000
-INKSCAPE		?= inkscape
-INSTALL			?= install
-JSDOC			?=	./node_modules/.bin/jsdoc
-OXIPNG			?= oxipng
-PAPER		 	=
-RJS				?= ./node_modules/.bin/r.js
-NPX				?= ./node_modules/.bin/npx
-SASS			?= ./node_modules/.bin/sass
-SED				?= sed
-SPHINXBUILD	 	?= ./bin/sphinx-build
-SPHINXOPTS		=
-XGETTEXT		= xgettext
+BOOTSTRAP			= ./node_modules/
+BUILDDIR			= ./docs
+KARMA				?= ./node_modules/.bin/karma
+CLEANCSS			?= ./node_modules/clean-css-cli/bin/cleancss
+HTTPSERVE_PORT		?= 8008
+HTTPS_SERVE_PORT	?= 8443
+INKSCAPE			?= inkscape
+INSTALL				?= install
+JSDOC				?= ./node_modules/.bin/jsdoc
+OXIPNG				?= oxipng
+PAPER		 		=
+RJS					?= ./node_modules/.bin/r.js
+NPX					?= ./node_modules/.bin/npx
+SASS				?= ./node_modules/.bin/sass
+SED					?= sed
+SPHINXBUILD	 		?= ./bin/sphinx-build
+SPHINXOPTS			=
+XGETTEXT			= xgettext
 
 
 
 
 # Internal variables.
 # Internal variables.
@@ -56,6 +57,7 @@ serve: node_modules dist
 .PHONY: serve_bg
 .PHONY: serve_bg
 serve_bg: node_modules
 serve_bg: node_modules
 	npm run serve -- -p $(HTTPSERVE_PORT) -s &
 	npm run serve -- -p $(HTTPSERVE_PORT) -s &
+	npm run serve-tls -- -p $(HTTPS_SERVE_PORT) -s &
 
 
 certs:
 certs:
 	mkdir certs
 	mkdir certs

+ 1 - 0
package.json

@@ -42,6 +42,7 @@
     "headless-dev": "webpack --config webpack/webpack.headless.js --mode=development",
     "headless-dev": "webpack --config webpack/webpack.headless.js --mode=development",
     "nodeps": "webpack --config webpack/webpack.nodeps.js",
     "nodeps": "webpack --config webpack/webpack.nodeps.js",
     "serve": "http-server -c-1",
     "serve": "http-server -c-1",
+    "serve-tls": "http-server -S -C certs/chat.example.org.crt -K certs/chat.example.org.key",
     "devserver": "webpack serve --config webpack/webpack.serve.js",
     "devserver": "webpack serve --config webpack/webpack.serve.js",
     "watch": "webpack --watch --config webpack/webpack.build.js --mode=development",
     "watch": "webpack --watch --config webpack/webpack.build.js --mode=development",
     "types": "tsc -p ./src/headless/tsconfig.json && tsc",
     "types": "tsc -p ./src/headless/tsconfig.json && tsc",