Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance
Java decentralizedintranet-searchintranet-search-enginep2pp2p-networkprivacyprivacy-protectionsearch-enginesearchenginewebweb-search-enginewebsearchwebseearch-engine
use environment variables to overwrite configuration variables you can i.e. do: export YACY_PORT=8092 && ./startYACY.sh Just append "YACY_" to uppercase version of environment variables and replace all "." with "_".
Michael Peter Christen3da762811730
diff --git a/htroot/ConfigBasic.html b/htroot/ConfigBasic.htmlindex 3dc64426a..d80d5df97 100644--- a/htroot/ConfigBasic.html+++ b/htroot/ConfigBasic.html@@ -104,7 +104,7 @@<dl><dt><label for="port">Peer Port: </label></dt><dd>- <input type="text" name="port" id="port" value="#[defaultPort]#" size="5" maxlength="5" #(hasSystemDefinedPort)#::disabled="disabled"#(/hasSystemDefinedPort)#/> #(hasSystemDefinedPort)#::(Set by system property '#[systemProperty]#')#(/hasSystemDefinedPort)# + <input type="text" name="port" id="port" value="#[defaultPort]#" size="5" maxlength="5" /> <input type="checkbox" name="withssl" id="withssl" #(withsslenabled)#::checked="checked"#(/withsslenabled)#>with SSL (https enabled#(withsslenabled)#:: on port <a href="Settings_p.html?page=ProxyAccess">#[sslport]#</a>#(/withsslenabled)#)</dd>#(upnp)#::<dt>diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.javaindex cf8a52bbe..16520dc0b 100644--- a/htroot/ConfigBasic.java+++ b/htroot/ConfigBasic.java@@ -303,8 +303,6 @@ public class ConfigBasic {// set default valuesprop.putHTML("defaultName", sb.peers.mySeed().getName());- prop.put("hasSystemDefinedPort", env.getLocalPortSystemProperty() != null ? 1 : 0);- prop.put("hasSystemDefinedPort_systemProperty", serverSwitch.LOCAL_PORT_SYSTEM_PROPERTY);prop.put("defaultPort", env.getLocalPort());prop.put("withsslenabled", env.getConfigBool("server.https", false) ? 1 : 0);lang = env.getConfig("locale.language", "default"); // re-assign lang, may have changeddiff --git a/source/net/yacy/server/serverSwitch.java b/source/net/yacy/server/serverSwitch.javaindex a41e07573..5c5763956 100644--- a/source/net/yacy/server/serverSwitch.java+++ b/source/net/yacy/server/serverSwitch.java@@ -58,9 +58,6 @@ import net.yacy.peers.Seed;import net.yacy.search.SwitchboardConstants;public class serverSwitch {-- /** Key of system property defining locally open http port */- public static final String LOCAL_PORT_SYSTEM_PROPERTY = "net.yacy.server.localPort";// configuration managementprivate final File configFile;@@ -133,6 +130,24 @@ public class serverSwitch {initProps.putAll(this.configProps);this.configProps = initProps;+ // Read system properties and set all variables that have a prefix "yacy.".+ // This will make it possible that settings can be overwritten with environment variables.+ // Do this i.e. with "export YACY_PORT=8091 && ./startYACY.sh"+ for (Map.Entry<Object, Object> entry: System.getProperties().entrySet()) {+ String yacykey = (String) entry.getKey();+ if (yacykey.startsWith("YACY_")) {+ key = yacykey.substring(5).toLowerCase().replace('_', '.');+ if (this.configProps.containsKey(key)) this.configProps.put(key, (String) entry.getValue());+ }+ }+ for (Map.Entry<String, String> entry: System.getenv().entrySet()) {+ String yacykey = entry.getKey();+ if (yacykey.startsWith("YACY_")) {+ key = yacykey.substring(5).toLowerCase().replace('_', '.');+ if (this.configProps.containsKey(key)) this.configProps.put(key, entry.getValue());+ }+ }+// save result; this may initially create a config file after// initializationsaveConfig();@@ -222,40 +237,17 @@ public class serverSwitch {return getConfigInt(key, dflt);}-- /**- * @return local http server port or null if system property is not defined- */- public Integer getLocalPortSystemProperty() {- String systemDefinedPort = System.getProperty(LOCAL_PORT_SYSTEM_PROPERTY);- Integer localPort = null;- if(systemDefinedPort != null) {- try {- localPort = Integer.parseInt(systemDefinedPort);- } catch(NumberFormatException e) {- log.warn("System property " + LOCAL_PORT_SYSTEM_PROPERTY + " is not valid : it should be a integer.");- }- }- return localPort;- }/*** Wrapper for {@link #getConfigInt(String, int)} to have a more consistent* API.*- * Default value 8090 will be used if no value is found in system properties and in configuration.+ * Default value 8090 will be used if no value is found in configuration.** @return the local http port of this system* @see #getPublicPort(String, int)*/public int getLocalPort() {-- /* A system property "net.yacy.server.localPort" may override configuration- * This is useful when running YaCy inside a container manager such as Heroku which decide which http port to use */- Integer localPort = getLocalPortSystemProperty();- if(localPort != null) {- return localPort;- }return getConfigInt(SwitchboardConstants.SERVER_PORT, 8090);}