Skip to content

Commit

Permalink
Merge branch 'enable_https' into hackathon_5_2
Browse files Browse the repository at this point in the history
# Conflicts:
#	addons/vuforia-spatial-core-addon
  • Loading branch information
ptc-rdeleeuw committed Feb 5, 2024
2 parents dc77f50 + 51f1ed9 commit 89e685f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions generate_cert.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/zsh

# generate certificate and key
libressl req -x509 -newkey rsa:4096 -nodes -keyout key.pem -sha256 -days 356 -out cert.pem
openssl req -x509 -newkey rsa:4096 -nodes -keyout key.pem -sha256 -days 356 -out cert.pem
4 changes: 2 additions & 2 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,8 @@ if (!isLightweightMobile) {


let options = {
key: fs.readFileSync('key.pem'),
cert: fs.readFileSync('cert.pem')
key: fs.readFileSync(__dirname + '/key.pem'),
cert: fs.readFileSync(__dirname + '/cert.pem')
};
const httpServer = require('https').createServer(options, webServer);
const http = httpServer.listen(serverPort, function () {
Expand Down

0 comments on commit 89e685f

Please sign in to comment.