3-2beta13

doc/example.conf

@@ -181,6 +181,7 @@ allow           channel {
 	W		get_umodew
 	^		can_stealth
 	H		get_host
+	v		can_override
 */
 
 /*
@@ -374,7 +375,7 @@ log "ircd.log" {
  * };
  */
 
-// This points the command /nickserv to the user NickServ who is connected to the set::services-name server
+// This points the command /nickserv to the user NickServ who is connected to the set::services-server server
 /*alias NickServ {
 	nick "NickServ";
 	type services;
@@ -405,7 +406,8 @@ alias StatServ { type stats; };
  * Syntax:
  * alias "name" {
  *	format "format string" {
- *		alias "points to";
+ *		nick "points to";
+ *              type aliastype;
  *		parameters "parameters to send";
  *	};
  *	type command;
@@ -417,11 +419,13 @@ alias StatServ { type stats; };
 /*
 alias "identify" {
 	format "^#" {
-		alias "chanserv";
+		nick "chanserv";
+		type services;
 		parameters "IDENTIFY %1-";
 	};
 	format "^[^#]" {
-		alias "nickserv";
+		nick "nickserv";
+		type services;
 		parameters "IDENTIFY %1-";
 	};
 	type command;
@@ -441,11 +445,13 @@ alias "identify" {
 /* Standard aliases */
 alias "services" {
 	format "^#" {
-		alias "chanserv";
+		nick "chanserv";
+		type services;
 		parameters "%1-";
 	};
 	format "^[^#]" {
-		alias "nickserv";
+		nick "nickserv";
+		type services;
 		parameters "%1-";
 	};
 	type command;
@@ -453,11 +459,13 @@ alias "services" {
 
 alias "identify" {
 	format "^#" {
-		alias "chanserv";
+		nick "chanserv";
+		type services;
 		parameters "IDENTIFY %1-";
 	};
 	format "^[^#]" {
-		alias "nickserv";
+		nick "nickserv";
+		type services;
 		parameters "IDENTIFY %1-";
 	};
 	type command;
@@ -675,7 +683,6 @@ set {
 		coadmin		"coadmin.roxnet.org";
 		admin		"admin.roxnet.org";
 		servicesadmin 	"csops.roxnet.org";
-		techadmin 	"techadmin.roxnet.org"; /* depreciated */
 		netadmin 	"netadmin.roxnet.org";
 		host-on-oper-up "no";
 	};
@@ -694,16 +701,12 @@ set {
 		retries 2s;
 	};
 	options {
-		enable-opermotd;
-		enable-chatops;
 		hide-ulines;
 		identd-check;
 		show-connect-info;
 	};
 
 	scan {
-		ban-message "Insecure SOCKS server";
-		quit-message "Insecure SOCKS server";
 		/* Choose this to be some IP and some port that's always open and
                  * reachable by the proxies 
                  */
@@ -716,7 +719,11 @@ set {
                  * What message should we NOTICE to the users when we scan them
 		*/
 		message "<insert scan notice here> (admin didn't edit config correctly)";
-		ban-time "4d";
+		/* How long should we ban proxies for? */
+		bantime 4d;
+		/* How long should we wait to see if the host has a proxy? */
+		timeout 15s;
+
 	};
 	ssl {
 		/* Reads entropy from the domain socket located at '~/entropy' */