From 3f8a685f19d5d3bc2a39d54c6e10ffc94a4eaa3f Mon Sep 17 00:00:00 2001
From: Danielv123 <tranen.bananen@gmail.com>
Date: Thu, 4 Jan 2018 18:54:30 +0100
Subject: [PATCH] resolves #66 added setting to not upload mods to master

---
 client.js   | 30 +++++++++++++++++-------------
 config.json | 15 ++++++++-------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/client.js b/client.js
index e6853220..34b5918c 100644
--- a/client.js
+++ b/client.js
@@ -591,19 +591,23 @@ function instanceManagement() {
 					console.log("master has mod");
 				} else if (response && body && typeof body == "string") {
 					let mod = response.body;
-					console.log("Sending mod: " + mod);
-					// Send mods master says it wants
-					// response.body is a string which is a modName.zip
-					var req = request.post("http://"+config.masterIP + ":" + config.masterPort + '/api/uploadMod', function (err, resp, body) {
-						if (err) {
-							console.log('Error!');
-							throw err
-						} else {
-							console.log('URL: ' + body);
-						}
-					});
-					var form = req.form();
-					form.append('file', fs.createReadStream("./instances/"+instance+"/mods/"+mod));
+					if(config.uploadModsToMaster){
+						console.log("Sending mod: " + mod);
+						// Send mods master says it wants
+						// response.body is a string which is a modName.zip
+						var req = request.post("http://"+config.masterIP + ":" + config.masterPort + '/api/uploadMod', function (err, resp, body) {
+							if (err) {
+								console.log('Error!');
+								throw err
+							} else {
+								console.log('URL: ' + body);
+							}
+						});
+						var form = req.form();
+						form.append('file', fs.createReadStream("./instances/"+instance+"/mods/"+mod));
+					} else {
+						console.log("Not sending mod: " + mod + " to master because config.uploadModsToMaster is not enabled")
+					}
 				}
 			});
 		}
diff --git a/config.json b/config.json
index dde9c633..779bcc1a 100644
--- a/config.json
+++ b/config.json
@@ -2,19 +2,19 @@
 	"__comment": "Where factorio folder. Should be in the same folder as this config file.",
 	"factorioDirectory": "factorio",
 	
-	"__comment": "IP players should connect to to join your servers, should be portforwarded and stuff",
+	"__comment1": "IP players should connect to to join your servers, should be portforwarded and stuff",
 	"publicIP": "localhost",
 	
-	"__comment": "IP the master web server runs at, can be ignored on the master system",
+	"__comment2": "IP the master web server runs at, can be ignored on the master system",
 	"masterIP": "localhost",
 	"masterPort": 8080,
 	
-	"__comment": "Your factorio.com username for factorio MP services, also username will be admin",
+	"__comment3": "Your factorio.com username for factorio MP services, also username will be admin",
 	"username": "",
-	"__comment": "Token from your factorio.com profile page. Required for MP and mod manager services.",
+	"__comment4": "Token from your factorio.com profile page. Required for MP and mod manager services.",
 	"token": "",
 	
-	"__comment": "General user settings",
+	"__comment5": "General user settings",
 	"verify_user_identity": false,
 	"auto_pause": false,
 	"allow_commands": "admins-only",
@@ -24,10 +24,11 @@
 		"public": true,
 		"lan": true
 	},
-	"__comment": "Statistic gathering statistics, may affect server performance (master memory usage especially)",
+	"__comment6": "Statistic gathering statistics, may affect server performance (master memory usage especially)",
 	"itemStats": {
 		"maxEntries":60,
 		"entriesPerSecond": 0.01666666667
 	},
-	"logItemTransfers": false
+	"logItemTransfers": false,
+	"uploadModsToMaster": true
 }