Commit Diff
Diff:
e8870ffdfbcf31e5318b752ba664287377f1e21d
cae514a32a31eeef3845fd024a0da42b4c956131
Commit:
cae514a32a31eeef3845fd024a0da42b4c956131
Tree:
21c6250cf9f1faa0014cd8d887f70ebfab589f6c
Author:
jrmu <jrmu@ircnow.org>
Committer:
jrmu <jrmu@ircnow.org>
Date:
Tue Mar 7 22:04:11 2023 UTC
Message:
Fixed processing of conf variables
blob - 5d9e1a20ce8d5bf6224587594e921d545d03c935
blob + d62b6590fa4a32e12ed973c95b93d8ef33f59340
--- Mail.pm
+++ Mail.pm
@@ -20,7 +20,7 @@ my $imapport = $conf{imapport};
my $smtpport = $conf{smtpport};
my $teamchans = $conf{teamchans};
my @teamchans = split /[,\s]+/m, $teamchans;
-my $mailwebpanel = $conf{mailwebpanel};
+my $webmail = $conf{webmail};
my $approval = $conf{approval};
my $expires = $conf{expires};
my $passwdpath = "/etc/mail/passwd";
@@ -217,7 +217,7 @@ Password: $password
Server: $mailhostname
IMAP Port: $imapport (STARTTLS)
SMTP Port: $smtpport (STARTTLS)
-Webpanel: $mailwebpanel
+Webpanel: $webmail
$approvemsg
*IMPORTANT*: Verify your email address:
blob - 37ceb7f98a2ea9641a595e4f91ed3d01ddc5f2bb
blob + f6124c63ef6e59e9c1d75f2ea7f3bd2c2b50c2a5
--- botnow
+++ botnow
@@ -107,9 +107,15 @@ $conf{port} = $conf{port} || 1337;
# Bouncer hostname
chomp($conf{hostname} = $conf{hostname} || `hostname`);
+# Mail hostname
+chomp($conf{mailhostname} = $conf{mailhostname} || `hostname`);
+
# Webpanel URL
chomp($conf{webpanel} = $conf{webpanel} || "https://bnc.$conf{hostname}");
+# Webmail URL
+chomp($conf{webmail} = $conf{webmail} || "https://mail.$conf{hostname}");
+
# External IPv4 address, plaintext and ssl port
$conf{ip4} = $conf{ip4} or die "ERROR: botnow.conf: ip4";
$conf{ip6} = $conf{ip6} or die "ERROR: botnow.conf: ip6";
blob - e44acd77d71b64fb77d2155a9caac72d8c14fa7d
blob + b7a173d3b4c4f8a240ac5521e422b1e4a513ba5e
--- botnow.conf.example
+++ botnow.conf.example
@@ -16,8 +16,8 @@ mailhostname = example.com
#Webpanel URL
webpanel = https://bnc.example.com
-#Webpanel URL
-mailwebpanel = https://mail.example.com
+#Webmail URL
+webmail = https://mail.example.com
#External IP addresses, plaintext and ssl port
ip4 = 192.168.0.1
IRCNow