diff --git a/defaults/yacy.init b/defaults/yacy.init index 343a5dbf2..f7af46cf9 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -90,7 +90,6 @@ filesize.max.other = 8589934591 # to the members of the separated network peers. network.unit.definition = defaults/yacy.network.freeworld.unit #network.unit.definition = defaults/yacy.network.intranet.unit -network.group.definition = defaults/yacy.network.group # Update process properties # The update server location is given in the network.unit.definition, diff --git a/defaults/yacy.network.group b/defaults/yacy.network.group deleted file mode 100644 index 47455c9e1..000000000 --- a/defaults/yacy.network.group +++ /dev/null @@ -1,29 +0,0 @@ -# YaCy Network Group Definition -# ----------------------------- -# This is an addition to the yacy.network.unit configuration file. -# This file is addressed by the network.group.definition property in defaults/yacy.init -# The purpose of a group within a network is that some parts of a network may be managed independently, -# while the content of the network stays private for the whole network, mostly for a special purpose. -# This file needs to be configured if someone wants to participate with several peers to the network, -# but wants to manage the group of own peers with a single master peer. -# One example application would be the use of computing-teams - -# Defintion of property domains: -# network.group.name = -# network.group.description = -# network.group.administration.control = 'uncontrolled'|'moderated'|'controlled' -# network.group.administration.manager = -# network.group.administration.request.authentication.method = 'salted-magic' -# network.group.administration.request.authentication.essentials = - -# -----------------------------------------------------------------# -# this is a work in progress. disabled properties are not yet used # -# -----------------------------------------------------------------# - -# properties for group access administrator-authentication: -#network.group.name = everybody -#network.group.description = Our Peer-Group -#network.group.administration.control = uncontrolled -#network.group.administration.manager = -#network.group.administration.request.authentication.method = salted-magic -#network.group.administration.request.authentication.essentials = \ No newline at end of file diff --git a/source/de/anomic/search/Switchboard.java b/source/de/anomic/search/Switchboard.java index 19f2bacfd..3d95a9fd9 100644 --- a/source/de/anomic/search/Switchboard.java +++ b/source/de/anomic/search/Switchboard.java @@ -705,7 +705,6 @@ public final class Switchboard extends serverSwitch { // load network configuration into settings String networkUnitDefinition = getConfig("network.unit.definition", "defaults/yacy.network.freeworld.unit"); - final String networkGroupDefinition = getConfig("network.group.definition", "yacy.network.group"); // patch old values if (networkUnitDefinition.equals("yacy.network.unit")) { @@ -734,11 +733,6 @@ public final class Switchboard extends serverSwitch { initProps = FileUtils.table(netDefReader); setConfig(initProps); - Map initGroupProps; - Reader netGroupDefReader = getConfigFileFromWebOrLocally(networkGroupDefinition, getAppPath().getAbsolutePath(), new File(workPath, "network.group.backup")); - initGroupProps = FileUtils.table(netGroupDefReader); - setConfig(initGroupProps); - // set release locations int i = 0; CryptoLib cryptoLib;