commit 12807ebe1e4ebcfa07e973dc4ee225859b42e08d
from: jrmu <jrmu@ircnow.org>
date: Fri Feb 10 03:38:15 2023 UTC

Cleaned up configuration options

commit - 04e3929f4a1137b3e34b0fc7b80bbe245dc0ebf2
commit + 12807ebe1e4ebcfa07e973dc4ee225859b42e08d
blob - 8dadce0b495d9854d8ce62a6b983da6cd557e77b
blob + edd59f3042d5a57f11bf0ccbb9734409e0cbada1
--- BNC.pm
+++ BNC.pm
@@ -29,7 +29,7 @@ my $sslport = $conf{sslport};
 my $plainport = $conf{plainport};
 my $mailfrom = $conf{mailfrom};
 my $mailname = $conf{mailname};
-my $zncconfpath = $conf{zncconfpath} || "$zncdir/.znc/configs/znc.conf";
+#my $zncconfpath = $conf{zncconfpath} || "$zncdir/.znc/configs/znc.conf";
 my $znctree = { Node => "root" };
 
 use constant {
@@ -41,14 +41,14 @@ use constant {
 
 `doas chown znc:daemon /home/znc/home/znc/.znc/configs/znc.conf`;
 `doas chmod g+r /home/znc/home/znc/.znc/`;
-my @zncconf = main::readarray($zncconfpath);
-$znctree;
+#my @zncconf = main::readarray($zncconfpath);
+#$znctree;
 my @users;
-foreach my $line (@zncconf) {
-	if ($line =~ /<User (.*)>/) {
-		push(@users, $1);
-	}
-}
+#foreach my $line (@zncconf) {
+#	if ($line =~ /<User (.*)>/) {
+#		push(@users, $1);
+#	}
+#}
 #$znctree = parseml($znctree, @zncconf);
 main::cbind("pub", "-", "bnc", \&mbnc);
 main::cbind("msg", "-", "bnc", \&mbnc);
@@ -60,14 +60,14 @@ main::cbind("msg", "-", "lastseen", \&mlastseen);
 
 sub init {
 	#znc.conf file
-	unveil("$zncconfpath", "r") or die "Unable to unveil $!";
+	#unveil("$zncconfpath", "r") or die "Unable to unveil $!";
 	#dependencies for figlet
 	unveil("/usr/local/bin/figlet", "rx") or die "Unable to unveil $!";
 	unveil("/usr/lib/libc.so.95.1", "r") or die "Unable to unveil $!";
 	unveil("/usr/libexec/ld.so", "r") or die "Unable to unveil $!";
 	unveil("/usr/bin/tail", "rx") or die "Unable to unveil $!";
 	#znc.log file
-	unveil("$znclog", "r") or die "Unable to unveil $!";
+	#unveil("$znclog", "r") or die "Unable to unveil $!";
 	#print treeget($znctree, "AnonIPLimit")."\n";
 	#print treeget($znctree, "ServerThrottle")."\n";
 	#print treeget($znctree, "ConnectDelay")."\n";
@@ -111,7 +111,6 @@ sub parseml {
 
 #Returns array of all values
 #treeget($tree, "User");
-#treeget($tree, "MaFFia Network");
 sub treeget {
 	my ($tree, @keys) = @_;
 	my $subtree;
@@ -457,7 +456,7 @@ sub mlastseen {
 	} else { $text = $args[0]; }
 	my $hostmask = "$nick!$host";
 	if (!@logs) { loadlog(); }
-	my @users = treeget($znctree, "User", "Node");
+	#my @users = treeget($znctree, "User", "Node");
 	foreach my $user (@users) {
 		my @lines = grep(/^\[\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\] \[$user\] connected to ZNC from [.0-9a-fA-F:]+/, @logs);
 		if (scalar(@lines) == 0) {
blob - 7707f181f81712a7ce97a23609ad07ca400ea794
blob + 720c3062d9d71f8b739e91dda834239da216dc8c
--- botnow.conf.example
+++ botnow.conf.example
@@ -1,12 +1,12 @@
-#Name of local network; default ircnow
-#localnet = ircnow
+#Name of your network
+localnet = example
 
-#Internal IPv4 address and plaintext port; default 127.0.0.1@1337
+#Botnow will connect to this address and port; default 127.0.0.1@1337
 #host = 127.0.0.1
 #port = 1337
 
 #Bouncer hostname
-hostname = example.ircnow.org
+hostname = example.com
 
 #External IP addresses, plaintext and ssl port
 ip4 = 192.168.0.1
@@ -16,26 +16,30 @@ ip6prefix = 48
 #plainport = 1337
 #sslport = 31337
 
-#Nick and password of bot -- make sure to add to oper block
-nick = botnow
+#Nick and password of bot.
+#NOTE: username and password must match the ircd oper block *and* znc account
+nick = example
 pass = password
 
 #List of channels for requesting bouncers
-chans = #ircnow #testing
+chans = #example
 
 #List of staff nicks; comment out to avoid highlights
-staff = jrmu test
+staff = user1 user2
 
 #List of team channels on localnet; comment out to disable
-teamchans = #ircnow-team
+teamchans = #example-team
 
 #Mail from address
-mailfrom = support@ircnow.org
-#mailname = support
+mailfrom = support@example.com
+#mailname = example
 
 #Modules to load
 modules = BNC DNS Mail Shell SQLite Hash Help
 
+#Terms of Service
+#terms = Part of the IRCNow Federation https://ircnow.org. Rules: no porn, no illegal drugs, no violent threats, no slander, no libel, no illegal gambling, no copyright infringement, no spam, no illegal cracking, and no DDoS. Only one account per person. Don't share passwords. Full terms: https://wiki.ircnow.org/index.php?n=Terms.Terms
+
 #Comment out the line below
 die = You did not configure botnow.conf!
 
@@ -44,9 +48,6 @@ die = You did not configure botnow.conf!
 #     Do not edit unless needed     #
 #####################################
 
-#Join chans on localnet?
-#localchans = False
-
 #Number of words in password
 #passlength = 3
 
@@ -64,6 +65,3 @@ die = You did not configure botnow.conf!
 
 #Verbosity: NONE, ERRORS, WARNINGS, ALL
 #verbose = ERRORS
-
-#Terms of Service
-#terms = IRCNow: Of the User, By the User, For the User. Rules: no porn, no illegal drugs, no gambling, no slander, no warez, no promoting violence, no spam, illegal cracking, or DDoS. Only one account per person. Don't share passwords. Full terms: https://ircnow.org/terms.php
blob - 5aa93d6c63763c0c4fcc48add4b139dbf743aeb7
blob + 2ef14a3342a3b4a4231a1384b1a147740d16e291
--- makefile
+++ makefile
@@ -41,7 +41,7 @@ figlet: 
 	pkg_add figlet-2.2.5
 
 php: 
-	pkg_add php-7.4.27
+	pkg_add php-8.0.8
 	pkg_add php-sqlite
 
 sqlite:
blob - e537c43e85c59b854d576b6dbe754bef099329aa
blob + e8ad8279fece41d76c9621cd8770f7d436de0d92
--- networks
+++ networks
@@ -7,11 +7,27 @@
 # Repeating the same network name will add multiple servers for a single network
 #
 # Please keep network names lowercase
-# Please edit 0000net and ircnow to connect to the local server's IPv6 address
+# Please edit 0000net to connect to your local server
 #
-0000net Your-IPv6-address 6667
-ircnow Your-IPv6-address 6667
+#
+# Comment out networks you don't want to preload
+#
+0000net Your-Server-Name 6667
+planetofnix irc6.planetofnix.com +6697
+nastycode irc6.nastycode.com +6697
+inspirenet irc6.inspirenet.org +6697
+ircforever irc6.ircforever.org +6697
+shelltalk irc6.shelltalk.net +6697
+rpblc irc6.rpblc.net +6697
+oddprotocol irc6.oddprotocol.org +6697
+lecturify irc6.lecturify.net +6697
+bsdforall irc6.bsdforall.org +6697
+thunderirc irc6.thunderirc.net +6697
+freeirc irc6.freeirc.org +6697
+cloud9p irc6.cloud9p.org +6697
+ircnow irc6.ircnow.org +6697
 2600net irc.2600.net 6667
+2f30 irc.2f30.org ~6697
 42net sol.42net.org 6667
 #abandoned-irc irc.abandoned-irc.net ~6697
 #abjects irc.abjects.net +6697
@@ -38,6 +54,7 @@ banglacafe irc.banglacafe.com 6667
 barton irc.barton.de 6667
 bgirc irc.bgirc.com ~6697
 bitlbee 127.0.0.1 6668
+bitreich irc.bitreich.org ~6697
 blitzed irc.blitzed.org +6697
 bolchat irc.bolchat.com 6667
 brasirc irc.brasirc.com.br ~6697
@@ -100,7 +117,7 @@ darkirc irc.darkirc.eu +6697
 darkirc irc.darklinux.uk +6697
 darkmyst irc2.darkmyst.org ~6697
 darkscience irc.darkscience.net +6697
-dejatoons irc.dejatoons.net ~6697
+dataswamp irc.dataswamp.org ~6697
 desirenet irc.desirenet.org 6667
 digitalirc irc.digitalirc.org +6697
 efnet irc.efnet.nl 6667
@@ -178,6 +195,7 @@ italian-amici irc.italian-amici.org 6667
 juggler irc.juggler.jp 6667
 kalbim irc.kalbim.net 6667
 kampungchat etnies6.ircd.link 6667
+liberachat irc.ipv6.libera.chat +6697
 librairc irc.librairc.net ~6697
 linuxconsole linuxconsole.net ~6697
 luatic irc.luatic.net 6667
@@ -190,13 +208,11 @@ nationchat irc.nationchat.org 6667
 netchat irc.netchat.cl 6667
 nfnet irc.nfnet.org 6667
 oftc irc6.oftc.net +6697
-#oftc irc.oftc.net +6697
 oltreirc irc.oltreirc.net +6697
 onlinegamesnet irc.onlinegamesnet.net 6667
 openjoke irc.openjoke.org ~6697
 overthewire ircs.overthewire.org +6697
 #optilan irc.optilan.eu 6667
-#p2p-net irc.p2p-network.net +6697
 perl irc.perl.org 6667
 pirc-pl irc.pirc.pl +6697
 ptnet irc.ptnet.org +6697
@@ -260,6 +276,7 @@ shadowcat irc.shadowcat.co.uk 6667
 shadowfire irc.shadowfire.org +7000
 shadowfire us.shadowfire.org +7000
 shadowfire eu.shadowfire.org +7000
+shoqni irc.shoqni.net 6667
 simosnap irc.simosnap.com +6697
 skychatz irc.skychatz.org ~6697
 slashnet irc.slashnet.org +6697