New upstream version 1.1.9.upstream/1.1.9

1 files changed, 28 insertions, 10 deletions

diff --git a/doc/reference.conf b/doc/reference.conf
index 69eb210..65a1b6c 100644
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -101,12 +101,12 @@ irc {
 	 * IP address to bind to for the IRC connection. You only need to
 	 * use this if you wish HOPM to use a particular interface
 	 * (virtual host, IP alias, ...) when connecting to the IRC server.
-	 * There is another "vhost" setting in the scan {} block below for
+	 * There is another "bind" setting in the scan {} block below for
 	 * the actual portscans. Note that this directive expects an IP address,
 	 * not a hostname. Please leave this commented out if you do not
 	 * understand what it does, as most people don't need it.
 	 */
-#	vhost = "0.0.0.0";
+#	bind = "0.0.0.0";
 
 	/*
 	 * Nickname for HOPM to use.
@@ -148,6 +148,23 @@ irc {
 	tls = no;
 
 	/*
+	 * rsa_private_key_file: the path to the file containing the RSA key.
+	 *
+	 * Once the RSA key is generated, it is highly recommended to lock down
+	 * its file permissions:
+	 *
+	 *    chown <ircd-user>.<ircd.group> rsa.key
+	 *    chmod 0600 rsa.key
+	 */
+#	rsa_private_key_file = "etc/rsa.key";
+
+	/*
+	 * tls_certificate_file: the path to the file containing our
+	 * TLS certificate for encrypted client connection.
+	 */
+#	tls_certificate_file = "etc/cert.pem";
+
+	/*
 	 * Checks if the host name defined above matches the identity in the
 	 * certificate.
 	 */
@@ -350,7 +367,7 @@ irc {
 	 */
 
 
-	/* dnsbl.dronebl.org - http://dronebl.org */
+	/* dnsbl.dronebl.org - https://dronebl.org */
 #	blacklist {
 		/* The DNS name of the blacklist */
 #		name = "dnsbl.dronebl.org";
@@ -382,7 +399,7 @@ irc {
 
 		/*
 		 * The actual values returned by the dnsbl.dronebl.org blacklist as
-		 * documented at http://dronebl.org/docs/howtouse
+		 * documented at https://dronebl.org/docs/howtouse
 		 */
 #		reply {
 #			2 = "Sample data used for heuristical analysis";
@@ -400,7 +417,8 @@ irc {
 #			15 = "Compromised router / gateway";
 #			16 = "Autorooting worms";
 #			17 = "Automatically determined botnet IPs (experimental)";
-#			18 = "DNS/MX type hostname detected on IRC";
+#			18 = "Possibly compromised DNS/MX type hostname detected on IRC";
+#			19 = "Abused VPN Service";
 #			255 = "Uncategorized threat class";
 #		};
 
@@ -408,7 +426,7 @@ irc {
 		 * The kline message sent for this specific blacklist, remember to put
 		 * the removal method in this.
 		 */
-#		kline = "KLINE 180 *@%i :You have a host listed in the DroneBL. For more information, visit http://dronebl.org/lookup_branded?ip=%i&network=Network";
+#		kline = "KLINE 180 *@%i :You have a host listed in the DroneBL. For more information, visit https://dronebl.org/lookup_branded?ip=%i&network=Network";
 #	};
 
 
@@ -426,7 +444,7 @@ irc {
 #			5 = "Drones / Flooding";
 #		};
 
-#		kline = "KLINE 180 *@%i :Blacklisted proxy found. For more information, visit http://rbl.efnetrbl.org/?i=%i";
+#		kline = "KLINE 180 *@%i :Blacklisted proxy found. For more information, visit https://rbl.efnetrbl.org/?i=%i";
 #	};
 
 
@@ -441,7 +459,7 @@ irc {
 #			1 = "TOR";
 #		};
 
-#		kline = "KLINE 180 *@%i :TOR exit node found. For more information, visit http://rbl.efnetrbl.org/?i=%i";
+#		kline = "KLINE 180 *@%i :TOR exit node found. For more information, visit https://rbl.efnetrbl.org/?i=%i";
 #	};
 
 	/*
@@ -577,7 +595,7 @@ scanner {
 	 * If you don't understand what this means, please leave this
 	 * commented out, as this is a major source of support queries!
 	 */
-#	vhost = "127.0.0.1";
+#	bind = "127.0.0.1";
 
 	/*
 	 * Maximum file descriptors this scanner can use. Remember that there
@@ -717,7 +735,7 @@ scanner {
 	 * they will override the defaults set in the first scanner
 	 * for this and subsequent scanners defined in the config file
 	 * This affects the following options:
-	 * fd, vhost, target_ip, target_port, target_string, timeout and
+	 * fd, bind, target_ip, target_port, target_string, timeout and
 	 * max_read.
 	 */
 };