diff --git a/.gitignore b/.gitignore index f170a976d9cbc0a582d26859716fdc0b76bf3727..9ec682868b023cf8f60cdbe709c9e0ad41d5c6a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,23 @@ -/Server/VA/recordings/ -/Server/recordings/ +# VS Code specific files +/Server/.vscode/ + +# Virtual Acoustics +/Server/VA/ + +# SSL Certificates +/Server/SignalingServer/certificates/ + +# Config files +/Server/config/ + +# Node modules /Server/node_modules/ -/Server/logs/ -/Server/SignalingServer/logs/ /Server/SignalingServer/node_modules/ -/Server/config/ -/Server/SignalingServer/certificates/ + +# SignalingServer /Server/SignalingServer/logs/ /Server/SignalingServer/modules/authentication/db/users.json -/Server/VA/* -/Server/SignalingServerOld/ /Server/SignalingServer/platform_scripts/cmd/coturn/ -/Server/SignalingServer/platform_scripts/cmd/node/ \ No newline at end of file +/Server/SignalingServer/platform_scripts/cmd/node/ +/Server/SignalingServer/SignalingServerOld/ +/Server/SignalingServer/authentication/config.json \ No newline at end of file diff --git a/Server/SignalingServer/cirrus.js b/Server/SignalingServer/cirrus.js index ff672fb420c8cb97c7493936525df9737aea540c..b23ce02b9ffd9d2a0ebe49c2249da8c2395c30a8 100644 --- a/Server/SignalingServer/cirrus.js +++ b/Server/SignalingServer/cirrus.js @@ -199,7 +199,7 @@ sendGameSessionData(); if(config.UseAuthentication){ if(config.EnableWebserver) { app.get('/login', function(req, res){ - res.sendFile(__dirname + '/login.htm'); + res.sendFile(__dirname + '/public/login.html'); }); } diff --git a/Server/SignalingServer/config.json b/Server/SignalingServer/config.json index 0c2b603161ddf4bffee6060861f3b7df78b54bc2..4fa35dfffec7e24da440e4d6d97b94d4af4011d2 100644 --- a/Server/SignalingServer/config.json +++ b/Server/SignalingServer/config.json @@ -1,8 +1,8 @@ { "UseFrontend": false, "UseMatchmaker": false, - "UseHTTPS": false, - "UseAuthentication": false, + "UseHTTPS": true, + "UseAuthentication": true, "LogToFile": true, "LogVerbose": true, "HomepageFile": "player.html", diff --git a/Server/SignalingServer/newUser.bat b/Server/SignalingServer/newUser.bat new file mode 100644 index 0000000000000000000000000000000000000000..92bdb328ba7f9922084fe134e1f929306c18285e --- /dev/null +++ b/Server/SignalingServer/newUser.bat @@ -0,0 +1,17 @@ +@echo off + +set "folder=./modules/authentication/db/" +set "script=store_password.js" +set "database=users.json" + +REM: print new line +echo. + +echo ############################# +echo ### Streaming user config ### +echo ############################# + +REM: print new line +echo. + +node %folder%%script% --username %1 --password %2 --usersFile %folder%%database% \ No newline at end of file