From 60ee03723a6e2c0896c3011f077c1dbf649d9119 Mon Sep 17 00:00:00 2001
From: root <root@super-lux.tail9122c8.ts.net>
Date: Wed, 6 Nov 2024 13:25:18 +0000
Subject: [PATCH] more last minute fixes

---
 Dockerfile           | 10 ++++-----
 config.env           |  2 --
 config.env.example   |  1 -
 docker-compose.yml   |  2 +-
 include.conf.example | 48 ++++++++++++++++++++++++++++++++++++++++++--
 inspircd.conf        | 11 +---------
 modules.conf         | 20 ++++++++++++------
 7 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6619420..480cd3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_SERVER_NAME="*"
+ARG BUILD_SERVER_NAME="irc.lame-network.local"
 
 ARG UBUNTU_VERSION="noble"
 
@@ -182,9 +182,7 @@ ENV LINK_TIMEOUT=3600
 
 ENV CLOAK_KEY="changemechangemechangemechangeme"
 
-ENV CLOAK_PREFIX="cloak/"
-
-ENV CLOAK_SUFFIX=".hidden"
+ENV CLOAK_SUFFIX="hidden"
 
 ENV BLOCK_AMSG_ACTION="killopers"
 
@@ -292,13 +290,13 @@ ENV IRCV3_EXTENDED_JOIN="yes"
 
 ENV JOIN_FLOOD_BOOT_WAIT="32s"
 
-ENV JOIN_FLOOD_DURATION="2m"
+ENV JOIN_FLOOD_DURATION="32s"
 
 ENV JOIN_FLOOD_SPLIT_WAIT="32s"
 
 ENV KNOCK_NOTIFY="both"
 
-ENV LIST_MAX_SIZE="100"
+ENV LIST_MAX_SIZE="256"
 
 ENV MESSAGE_FLOOD_NOTICE="1.0"
 
diff --git a/config.env b/config.env
index 0304141..f11b872 100644
--- a/config.env
+++ b/config.env
@@ -21,8 +21,6 @@ LINK_RECV_PASSWORD="MTg4ZDNjNTE5ZDU2MTQxZDdmZWNmNjU1ZjUzY2NkMWM3M2ZmMTY2NmFmYWJh
 LINK_SEND_PASSWORD="MTg4ZDNjNTE5ZDU2MTQxZDdmZWNmNjU1ZjUzY2NkMWM3M2ZmMTY2NmFmYWJhOWIw"
 LINK_TIMEOUT="32"
 CLOAK_KEY="NzY2NDM5NTkyOTVmOTdmZDkzODA2NDk5MWRmNjVjZjRhMzcyOGZjMTgwY2YwMGIz"
-CLOAK_PREFIX="cloak/"
-CLOAK_SUFFIX=".hidden"
 TOR_PREFIX="tor/"
 DEFAULT_USER_MODES="x"
 SSL_USER_MODES="x"
diff --git a/config.env.example b/config.env.example
index e51167b..c6eead7 100644
--- a/config.env.example
+++ b/config.env.example
@@ -21,7 +21,6 @@ LINK_RECV_PASSWORD="changeme"
 LINK_SEND_PASSWORD="changeme"
 LINK_TIMEOUT="32"
 CLOAK_KEY="changemechangemechangemechangeme"
-CLOAK_PREFIX="cloak/"
 CLOAK_SUFFIX=".hidden"
 TOR_PREFIX="tor/"
 DEFAULT_USER_MODES="x"
diff --git a/docker-compose.yml b/docker-compose.yml
index da7abc6..1f66f02 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     image: inspi4
     network_mode: "host"
     env_file: "config.env"
-    command: /usr/local/bin/inspircd -c /etc/inspircd/inspircd.conf -F -d
+    command: /usr/local/bin/inspircd -c /etc/inspircd/inspircd.conf -F
     volumes:
       - ./custom:/etc/inspircd/custom:ro
       - ssl:/etc/ssl/inspircd
diff --git a/include.conf.example b/include.conf.example
index 08ee10e..711dac4 100644
--- a/include.conf.example
+++ b/include.conf.example
@@ -4,10 +4,10 @@
 #             server="temple.supernets.org">
 
 #<link allowmask="*"
-#      bind="100.83.238.47"
+#      bind="1.2.3.4"
 #      hidden="no"
 #      sslprofile="defaultssl"
-#      ipaddr="100.79.209.72"
+#      ipaddr="4.2.3.1"
 #      name="temple.supernets.org"
 #      port="&env.SERVER_SSL_PORT;"
 #      recvpass="&env.LINK_RECV_PASSWORD;"
@@ -169,3 +169,47 @@
 <passforward cmd="SQUERY $nickrequired :IDENTIFY $nick $pass"
              forwardmsg="NOTICE $nick :*** Forwarding PASS to $nickrequired"
              nick="NICKSERV">
+
+#<module name="account">
+
+#<module name="blockhighlight">
+
+#<module name="connectban">
+
+#<module name="connflood">
+
+#<module name="cve_2024_39844">
+
+#<module name="delayuse">
+
+#<module name="discordnick">
+
+#<module name="eventexec">
+
+#<module name="helpmode">
+
+#<module name="ipinfo_io">
+
+#<module name="ircv3_extjwt">
+
+#<module name="ldapauth">
+
+#<module name="messagelength">
+
+#<module name="multiprefix">
+
+#<module name="opmoderated">
+
+#<module name="randomidxlines">
+
+#<module name="randquote">
+
+#<module name="realnameban">
+
+#<module name="solvemsg">
+
+#<module name="sqlauth">
+
+#<module name="sqloper">
+
+#<module name="qrcode">
diff --git a/inspircd.conf b/inspircd.conf
index b16e0fa..1324c6a 100644
--- a/inspircd.conf
+++ b/inspircd.conf
@@ -172,10 +172,6 @@
       name="GlobalOp"
       vhost="&env.GLOBAL_OP_VHOST;">
 
-<type classes="SACommands OperChat BanControl HostCloak ServerLink"
-      name="HOPM"
-      vhost="&env.HOPM_VHOST;">
-
 <type classes="HostCloak"
       name="Helper"
       vhost="&env.HELPER_VHOST;">
@@ -358,9 +354,8 @@
 <channels opers="&env.CHANNELS_OPERS;"
           users="&env.CHANNELS_USERS;">
 
-<cloak method="hmac-sha256"
+<cloak method="hmac-sha256-addr"
        key="&env.CLOAK_KEY;"
-       prefix="&env.CLOAK_PREFIX;"
        suffix="&env.CLOAK_SUFFIX;">
 
 <connectban banmessage="filtered for connection hammering; wait 64 seconds to retry"
@@ -545,10 +540,6 @@
                listmodes="yes"
                saveperiod="1d">
 
-<qrcode blockchar=" "
-        darkcolour="black"
-        lightcolour="white">
-
 <remove protectedrank="50000"
         supportnokicks="&env.REMOVE_SUPPORT_NO_KICKS;">
 
diff --git a/modules.conf b/modules.conf
index 506374d..fa5aea4 100644
--- a/modules.conf
+++ b/modules.conf
@@ -36,7 +36,11 @@
 <module name="chgname">
 <module name="classban">
 <module name="clearchan">
-<module name="cloaking">
+<module name="cloak">
+<module name="cloak_sha256">
+<module name="cloak_static">
+<module name="cloak_unreal">
+<module name="cloak_user">
 <module name="clones">
 <module name="codepage">
 <module name="commonchans">
@@ -109,7 +113,6 @@
 <module name="modenotice">
 <module name="monitor">
 <module name="muteban">
-<module name="mysql">
 <module name="namedmodes">
 <module name="namesx">
 <module name="nickflood">
@@ -134,9 +137,7 @@
 <module name="password_hash">
 <module name="pbkdf2">
 <module name="permchannels">
-<module name="pgsql">
 <module name="protoctl">
-<module name="qrcode">
 <module name="redirect">
 <module name="regex_glob">
 <module name="regex_pcre2">
@@ -174,8 +175,6 @@
 <module name="shun">
 <module name="silence">
 <module name="spanningtree">
-<module name="sqlite3">
-<module name="ssl_gnutls">
 <module name="sslinfo">
 <module name="sslmodes">
 <module name="sslrehashsignal">
@@ -196,3 +195,12 @@
 <module name="watch">
 <module name="websocket">
 <module name="xline_db">
+<module name="regex_pcre">
+<module name="pgsql">
+<module name="mysql">
+<module name="sqlite3">
+<module name="ssl_mbedtls">
+<module name="ssl_openssl">
+<module name="ssl_gnutls">
+<module name="log_sql">
+<module name="log_syslog">