|
@@ -34,7 +34,7 @@ IN_DEFAULT_INSTALL=1
|
34
|
34
|
SHOW_ON_ABOUT=1
|
35
|
35
|
|
36
|
36
|
IRC_BOUNCER_PORT=6697
|
37
|
|
-IRC_ONION_PORT=$IRC_BOUNCER_PORT
|
|
37
|
+IRC_ONION_PORT=8098
|
38
|
38
|
IRC_PORT=6698
|
39
|
39
|
|
40
|
40
|
# An optional password to log into IRC. This applies to all users
|
|
@@ -59,10 +59,10 @@ function start_irc_bouncer {
|
59
|
59
|
update_default_domain
|
60
|
60
|
if [ ! -f /home/znc/.znc/znc.pem ]; then
|
61
|
61
|
# no certificate exists
|
62
|
|
- su -c 'znc -p' - znc
|
|
62
|
+ su -c 'proxychains znc -p' - znc
|
63
|
63
|
else
|
64
|
64
|
# an existing certificate is being used
|
65
|
|
- su -c 'znc' - znc
|
|
65
|
+ su -c 'proxychains znc' - znc
|
66
|
66
|
fi
|
67
|
67
|
}
|
68
|
68
|
|
|
@@ -578,7 +578,7 @@ function install_irc_bouncer {
|
578
|
578
|
return
|
579
|
579
|
fi
|
580
|
580
|
|
581
|
|
- apt-get -yq -t jessie-backports install znc
|
|
581
|
+ apt-get -yq -t jessie-backports install znc proxychains
|
582
|
582
|
|
583
|
583
|
adduser --disabled-login --gecos 'znc' znc
|
584
|
584
|
|
|
@@ -605,6 +605,19 @@ function install_irc_bouncer {
|
605
|
605
|
echo '</Listener>' >> /home/znc/.znc/configs/znc.conf
|
606
|
606
|
echo '' >> /home/znc/.znc/configs/znc.conf
|
607
|
607
|
|
|
608
|
+ if [ $IRC_PORT -ne $IRC_ONION_PORT ]; then
|
|
609
|
+ echo '<Listener listener1>' >> /home/znc/.znc/configs/znc.conf
|
|
610
|
+ echo ' AllowIRC = true' >> /home/znc/.znc/configs/znc.conf
|
|
611
|
+ echo ' AllowWeb = false' >> /home/znc/.znc/configs/znc.conf
|
|
612
|
+ echo ' IPv4 = true' >> /home/znc/.znc/configs/znc.conf
|
|
613
|
+ echo ' IPv6 = true' >> /home/znc/.znc/configs/znc.conf
|
|
614
|
+ echo " Port = ${IRC_ONION_PORT}" >> /home/znc/.znc/configs/znc.conf
|
|
615
|
+ echo ' SSL = false' >> /home/znc/.znc/configs/znc.conf
|
|
616
|
+ echo ' URIPrefix = /' >> /home/znc/.znc/configs/znc.conf
|
|
617
|
+ echo '</Listener>' >> /home/znc/.znc/configs/znc.conf
|
|
618
|
+ echo '' >> /home/znc/.znc/configs/znc.conf
|
|
619
|
+ fi
|
|
620
|
+
|
608
|
621
|
chown -R znc:znc /home/znc/.znc
|
609
|
622
|
|
610
|
623
|
add_user_irc_bouncer "${MY_USERNAME}" "${IRC_PASSWORD}" true
|