Allow serializable fields to use storage in the respective objects.

Split service management code nito a proper servicemanager. Make service
references managed instead of lazy lookup. Also made events and
serializable use service manager instead of their respective systems for
management

2 files changed, 0 insertions, 87 deletions

diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf
index 719f8ac9e..c65be299f 100644
--- a/data/chanserv.example.conf
+++ b/data/chanserv.example.conf
@@ -155,11 +155,6 @@ module
 	disallow_hostmask_access = false
 
 	/*
-	 * If set, prevents channels from being on access lists.
-	 */
-	disallow_channel_access = false
-
-	/*
 	 * If set, ChanServ will always lower the timestamp of registered channels to their registration date.
 	 * This prevents several race conditions where unauthorized users can join empty registered channels and set
 	 * modes etc. prior to services deopping them.
diff --git a/data/modules.example.conf b/data/modules.example.conf
index 10c6255f9..89166e619 100644
--- a/data/modules.example.conf
+++ b/data/modules.example.conf
@@ -429,88 +429,6 @@ module { name = "help" }
 }
 
 /*
- * proxyscan
- *
- * This module allows you to scan connecting clients for open proxies.
- * Note that using this will allow users to get the IP of your services.
- *
- * Currently the two supported proxy types are HTTP and SOCKS5.
- *
- * The proxy scanner works by attempting to connect to clients when they
- * connect to the network, and if they have a proxy running instruct it to connect
- * back to services. If services are able to connect through the proxy to itself
- * then it knows it is an insecure proxy, and will ban it.
- */
-#module
-{
-	name = "proxyscan"
-
-	/*
-	 * The target IP services tells the proxy to connect back to. This must be a publicly
-	 * available IP that remote proxies can connect to.
-	 */
-	#target_ip = "127.0.0.1"
-
-	/*
-	 * The port services tells the proxy to connect to.
-	 */
-	target_port = 7226
-
-	/*
-	 * The listen IP services listen on for incoming connections from suspected proxies.
-	 * This probably will be the same as target_ip, but may not be if you are behind a firewall (NAT).
-	 */
-	#listen_ip = "127.0.0.1"
-
-	/*
-	 * The port services should listen on for incoming connections from suspected proxies.
-	 * This most likely will be the same as target_port.
-	 */
-	listen_port = 7226
-
-	/*
-	 * An optional notice sent to clients upon connect.
-	 */
-	#connect_notice = "We will now scan your host for insecure proxies. If you do not consent to this scan please disconnect immediately."
-
-	/*
-	 * Who the notice should be sent from.
-	 */
-	#connect_source = "OperServ"
-
-	/*
-	 * If set, OperServ will add infected clients to the akill list. Without it, OperServ simply sends
-	 * a timed G/K-line to the IRCd and forgets about it. Can be useful if your akill list is being filled up by bots.
-	 */
-	add_to_akill = yes
-
-	/*
-	 * How long before connections should be timed out.
-	 */
-	timeout = 5
-
-	proxyscan
-	{
-		/* The type of proxy to check for. A comma separated list is allowed. */
-		type = "HTTP"
-
-		/* The ports to check. */
-		port = "80,8080"
-
-		/* How long to set the ban for. */
-		time = 4h
-
-		/*
-		 * The reason to ban the user for.
-		 * %h is replaced with the type of proxy found.
-		 * %i is replaced with the IP of proxy found.
-		 * %p is replaced with the port.
-		 */
-		reason = "You have an open proxy running on your host (%t:%i:%p)"
-	}
-}
-
-/*
  * sasl
  *
  * Some IRCds allow "SASL" authentication to let users identify to Services