commit 36684717edbce0c82962bfe1cc406d07e1e53bc6
from: jrmu <jrmu@ircnow.org>
date: Fri Feb 17 03:59:38 2023 UTC

Cleaned up some conf values

commit - 0cd29639086e90ded817672d505ab0d009e6a9ab
commit + 36684717edbce0c82962bfe1cc406d07e1e53bc6
blob - 176d6fc46029352447e235c1dc96b00f2d2d5145
blob + 456d4c05620636017f5740d85390d00f0e1b00ea
--- botnow
+++ botnow
@@ -83,8 +83,10 @@ $conf{pass} = $conf{pass} or die "ERROR: botnow.conf: 
 # Comma-separated list of channels for requesting bouncers
 $conf{chans} = $conf{chans} or die "ERROR: botnow.conf: chans";
 
-# Number of words in password
-$conf{passlength} = $conf{passlength} || 3;
+my @activenets;
+if (defined($conf{activenets})) {
+	@activenets = split(/\s+/, $conf{activenets});
+}
 
 # Mail from address
 if (!defined($conf{mailname})) {
@@ -93,11 +95,33 @@ if (!defined($conf{mailname})) {
 	}
 }
 
-# ZNC install directory
-$conf{zncdir} = $conf{zncdir} || "/home/znc/home/znc";
+my @modules;
+if (defined($conf{modules})) {
+	@modules = split(/\s+/, $conf{modules});
+}
+use lib './';
+foreach my $mod (@modules) {
+	require "$mod.pm";
+}
+foreach my $mod (@modules) {
+	my $init = "${mod}::init";
+	$init->();
+}
 
+# Terms of Service; don't edit lines with the word EOF
+$conf{terms} = $conf{terms} or die "ERROR: botnow.conf terms";
+
+# Number of words in password
+$conf{passlength} = $conf{passlength} || 3;
+
+# Time before captcha expires
+$conf{expires} = $conf{expires} || 1800;
+
 # NSD zone dir
 $conf{zonedir} = $conf{zonedir} || "/var/nsd/zones/master/";
+
+# ZNC install directory
+$conf{zncdir} = $conf{zncdir} || "/home/znc/home/znc";
 
 # Network Interface Config File
 $conf{hostnameif} = $conf{hostnameif} || "/etc/hostname.vio0";
@@ -111,33 +135,11 @@ use constant {
 };
 $conf{verbose} = $conf{verbose} || ERRORS;
 
-# Terms of Service; don't edit lines with the word EOF
-$conf{terms} = $conf{terms} or die "ERROR: botnow.conf terms";
+# File containing IRC networks
+$conf{netpath} = "networks";
 
-$conf{ipv6path} = "ipv6s"; # ipv6 file path
-$conf{netpath} = "networks"; # networks file path
-$conf{expires} = $conf{expires} || 1800; # time before captcha expires
-
 if(defined($conf{die})) { die $conf{die}; }
 
-my @modules;
-if (defined($conf{modules})) {
-	@modules = split(/\s+/, $conf{modules});
-}
-my @activenets;
-if (defined($conf{activenets})) {
-	@activenets = split(/\s+/, $conf{activenets});
-}
-
-use lib './';
-foreach my $mod (@modules) {
-	require "$mod.pm";
-}
-foreach my $mod (@modules) {
-	my $init = "${mod}::init";
-	$init->();
-}
-
 our @networks;
 my @bots;
 my @months = qw( Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec );
@@ -154,14 +156,12 @@ my $localnet = $conf{localnet};
 my $staff = $conf{staff};
 my @stafflist = split(/ /,$staff);
 my $verbose = $conf{verbose};
-my $ipv6path = $conf{ipv6path};
 my $netpath = $conf{netpath};
 my $expires = $conf{expires};
 
 unveil("./", "r") or die "Unable to unveil $!";
 unveil("$confpath", "r") or die "Unable to unveil $!";
 unveil("$netpath", "r") or die "Unable to unveil $!";
-unveil("$ipv6path", "rwc") or die "Unable to unveil $!";
 unveil() or die "Unable to lock unveil $!";
 
 #dns and inet for sockets, proc and exec for figlet
blob - 7fa618bd68f96724c04198580528bb0c86b10b08
blob + 7d33cc247df620e0e640c937e84eb608c09106d2
--- botnow.conf.example
+++ botnow.conf.example
@@ -13,11 +13,16 @@ hostname = example.com
 #External IP addresses, plaintext and ssl port
 ip4 = 192.168.0.1
 ip6 = 2001:db8::
-ip6subnet = 64
-ip6prefix = 48
 #plainport = 1337
 #sslport = 31337
 
+#Your IPv6 subnet length
+ip6subnet = 64
+
+#Routing prefix for your IPv6 network
+#NOTE: this will be a smaller number than above!
+ip6prefix = 48
+
 #Nick and password of bot.
 #NOTE: username and password must match the ircd oper block *and* znc account
 nick = example