From 26b81b06aae0934f092eaa29551a54f9d9ce81c0 Mon Sep 17 00:00:00 2001
From: sd4v1d <sasa.davidovic@ri.carnet.hr>
Date: Thu, 10 Mar 2022 14:13:55 +0100
Subject: [PATCH 1/2] correcting configuration and github action

- removing options from config.example.js file
- run github action only on master branch
- bump version to 3.5.3
---
 .github/workflows/develop-deb.yml |  2 +-
 app/package.json                  |  2 +-
 server/config/config.example.js   | 53 -------------------------------
 server/package.json               |  2 +-
 4 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/develop-deb.yml b/.github/workflows/develop-deb.yml
index 43371044..5953ab07 100644
--- a/.github/workflows/develop-deb.yml
+++ b/.github/workflows/develop-deb.yml
@@ -2,7 +2,7 @@ name: Debian package
 
 on: 
   push:
-    branches: [ master, develop ]
+    branches: [ master ]
 #  pull_request:
 #    branches: [ develop ]
 
diff --git a/app/package.json b/app/package.json
index 34f9d2bb..8cbd2a99 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "edumeet",
-	"version": "3.5.2",
+	"version": "3.5.3",
 	"private": true,
 	"description": "edumeet meeting service",
 	"author": "Håvar Aambø Fosstveit <h@fosstveit.net>",
diff --git a/server/config/config.example.js b/server/config/config.example.js
index 2805e25b..8cea477f 100644
--- a/server/config/config.example.js
+++ b/server/config/config.example.js
@@ -119,59 +119,6 @@ module.exports =
 		}
 	},
 	*/
-	// URI and key for requesting geoip-based TURN server closest to the client
-	turnAPIKey    : 'examplekey',
-	turnAPIURI    : 'https://example.com/api/turn',
-	turnAPIparams : {
-		'uri_schema' 	: 'turn',
-		'transport' 		: 'tcp',
-		'ip_ver'    		: 'ipv4',
-		'servercount'	: '2'
-	},
-	turnAPITimeout    : 2 * 1000,
-	// Backup turnservers if REST fails or is not configured
-	backupTurnServers : [
-		{
-			urls : [
-				'turn:turn.example.com:443?transport=tcp'
-			],
-			username   : 'example',
-			credential : 'example'
-		}
-	],
-	// bittorrent tracker: please replace this if you want a more private file sharing service inside eduMEET
-	// have a look at https://github.com/webtorrent/bittorrent-tracker for setup your own tracker
-	fileTracker : 'wss://tracker.openwebtorrent.com',  
-	// redis server options
-	redisOptions : {},
-	// session cookie secret
-	cookieSecret : 'T0P-S3cR3t_cook!e',
-	cookieName   : 'edumeet.sid',
-	// if you use encrypted private key the set the passphrase
-	tls          :
-	{
-		cert : `${__dirname}/../certs/mediasoup-demo.localhost.cert.pem`,
-		// passphrase: 'key_password'
-		key  : `${__dirname}/../certs/mediasoup-demo.localhost.key.pem`
-	},
-	// listening Host or IP 
-	// If omitted listens on every IP. ("0.0.0.0" and "::")
-	// listeningHost: 'localhost',
-	// Listening port for https server.
-	listeningPort         : 443,
-	// Any http request is redirected to https.
-	// Listening port for http server.
-	listeningRedirectPort : 80,
-	// Listens only on http, only on listeningPort
-	// listeningRedirectPort disabled
-	// use case: loadbalancer backend
-	httpOnly              : false,
-	// WebServer/Express trust proxy config for httpOnly mode
-	// You can find more info:
-	//  - https://expressjs.com/en/guide/behind-proxies.html
-	//  - https://www.npmjs.com/package/proxy-addr
-	// use case: loadbalancer backend
-	trustProxy            : '',
 	// This logger class will have the log function
 	// called every time there is a room created or destroyed,
 	// or peer created or destroyed. This would then be able
diff --git a/server/package.json b/server/package.json
index e91b5c5e..f0e47525 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "edumeet-server",
-	"version": "3.5.2",
+	"version": "3.5.3",
 	"private": true,
 	"description": "edumeet server",
 	"author": "Håvar Aambø Fosstveit <h@fosstveit.net>",

From c9e324e201e089eb176108317a1750724a4dc64f Mon Sep 17 00:00:00 2001
From: sd4v1d <sasa.davidovic@ri.carnet.hr>
Date: Thu, 10 Mar 2022 14:45:01 +0100
Subject: [PATCH 2/2] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82263839..67f98c91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## 3.5.3
+  Hotfix configuration issue
 ## 3.5.2
   Security update for dependencies
 ## 3.5.1