From ce34c5fd7d0cb6c59b78f7bba1a7aa9f980f7fd4 Mon Sep 17 00:00:00 2001
From: acidvegas <acid.vegas@acid.vegas>
Date: Sun, 3 Nov 2024 23:44:00 -0500
Subject: [PATCH] Patch applied from sq

---
 Dockerfile          | 16 +++++++---------
 config.env.example  |  1 -
 custom/include.conf |  2 +-
 inspircd.conf       |  5 +----
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dd0b3a6..c046790 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
-FROM ubuntu:latest
-
 ARG BUILD_SERVER_NAME="irc.lame-network.local"
 
+ARG UBUNTU_VERSION="noble"
+
+FROM ubuntu:${UBUNTU_VERSION}
+
 ENV ADMIN_EMAIL="no-reply@lame-netwoork.local"
 
 ENV SID="01A"
@@ -174,15 +176,13 @@ ENV SERVICES_ULINE="services.lame-network.local"
 
 ENV WS_ORIGIN_ALLOW="irc.lame-network.local"
 
-ENV DEFAULT_BLOCK_HOST_MASK="*@*"
-
 ENV LINK_RECV_PASSWORD="changeme"
 
 ENV LINK_SEND_PASSWORD="changeme"
 
 ENV LINK_TIMEOUT=3600
 
-ENV CLOAK_KEY="changeme"
+ENV CLOAK_KEY="changemechangemechangemechangeme"
 
 ENV CLOAK_IGNORE_CASE="no"
 
@@ -436,6 +436,8 @@ RUN git clone https://github.com/inspircd/inspircd.git
 
 WORKDIR /tmp/inspircd
 
+RUN git checkout -b master 7734b2e
+
 RUN ./configure --gid inspircd --uid inspircd --development --prefix=/usr/local
 
 RUN ./modulemanager list | awk '{print $1}' | xargs -i ./modulemanager install {} ; true
@@ -454,10 +456,6 @@ ADD custom/ /etc/inspircd/custom
 
 ADD GeoLite2-Country.mmdb /etc/inspircd
 
-ADD motd.txt /etc/inspircd/motd.txt
-
-ADD oper.motd.txt /etc/inspircd/oper.motd.txt
-
 RUN openssl genrsa -out /etc/ssl/inspircd/server.key
 
 RUN openssl req -new -key /etc/ssl/inspircd/server.key -out /etc/ssl/inspircd/server.csr \
diff --git a/config.env.example b/config.env.example
index 83795b9..c095e04 100644
--- a/config.env.example
+++ b/config.env.example
@@ -18,7 +18,6 @@ HOPM_VHOST="hopm/lame-network.local"
 HELPER_VHOST="helper/lame-network.local"
 SERVICES_ULINE="services.lame-network.local"
 WS_ORIGIN_ALLOW="irc.lame-network.local"
-DEFAULT_BLOCK_HOST_MASK="nothing"
 LINK_RECV_PASSWORD="changeme"
 LINK_SEND_PASSWORD="changeme"
 LINK_TIMEOUT="32"
diff --git a/custom/include.conf b/custom/include.conf
index 33c767c..e1b9c6c 100644
--- a/custom/include.conf
+++ b/custom/include.conf
@@ -9,7 +9,7 @@
             requestclientcert="no"
             provider="gnutls">
 
-<badhost host="&env.DEFAULT_BLOCK_HOST_MASK;"
+<badhost host="*@*"
          reason="default hostmask block">
 
 <exception host="*@127.0.0.1/32"
diff --git a/inspircd.conf b/inspircd.conf
index c3420f5..4dedb3e 100644
--- a/inspircd.conf
+++ b/inspircd.conf
@@ -1,9 +1,6 @@
-<include directory="/etc/inspircd/modules.conf">
+<include file="/etc/inspircd/modules.conf">
 <include directory="/etc/inspircd/custom">
 
-
-<admin name="Adam Inistrator" description="Supreme Overlord" email="blackhole@enterthevoid.org">
-
 <badip ipmask="169.254.0.0/16"  reason="APIPA">
 <badip ipmask="10.0.0.0/8"      reason="Unclassified (ARPANET)">
 <badip ipmask="100.64.0.0/10"   reason="Unclassified (CGNAT)">