Patch applied from sq

This commit is contained in:
Dionysus 2024-11-03 23:44:00 -05:00
parent 09e99d2122
commit ce34c5fd7d
4 changed files with 9 additions and 15 deletions

View File

@ -1,7 +1,9 @@
FROM ubuntu:latest
ARG BUILD_SERVER_NAME="irc.lame-network.local" 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 ADMIN_EMAIL="no-reply@lame-netwoork.local"
ENV SID="01A" ENV SID="01A"
@ -174,15 +176,13 @@ ENV SERVICES_ULINE="services.lame-network.local"
ENV WS_ORIGIN_ALLOW="irc.lame-network.local" ENV WS_ORIGIN_ALLOW="irc.lame-network.local"
ENV DEFAULT_BLOCK_HOST_MASK="*@*"
ENV LINK_RECV_PASSWORD="changeme" ENV LINK_RECV_PASSWORD="changeme"
ENV LINK_SEND_PASSWORD="changeme" ENV LINK_SEND_PASSWORD="changeme"
ENV LINK_TIMEOUT=3600 ENV LINK_TIMEOUT=3600
ENV CLOAK_KEY="changeme" ENV CLOAK_KEY="changemechangemechangemechangeme"
ENV CLOAK_IGNORE_CASE="no" ENV CLOAK_IGNORE_CASE="no"
@ -436,6 +436,8 @@ RUN git clone https://github.com/inspircd/inspircd.git
WORKDIR /tmp/inspircd WORKDIR /tmp/inspircd
RUN git checkout -b master 7734b2e
RUN ./configure --gid inspircd --uid inspircd --development --prefix=/usr/local RUN ./configure --gid inspircd --uid inspircd --development --prefix=/usr/local
RUN ./modulemanager list | awk '{print $1}' | xargs -i ./modulemanager install {} ; true 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 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 genrsa -out /etc/ssl/inspircd/server.key
RUN openssl req -new -key /etc/ssl/inspircd/server.key -out /etc/ssl/inspircd/server.csr \ RUN openssl req -new -key /etc/ssl/inspircd/server.key -out /etc/ssl/inspircd/server.csr \

View File

@ -18,7 +18,6 @@ HOPM_VHOST="hopm/lame-network.local"
HELPER_VHOST="helper/lame-network.local" HELPER_VHOST="helper/lame-network.local"
SERVICES_ULINE="services.lame-network.local" SERVICES_ULINE="services.lame-network.local"
WS_ORIGIN_ALLOW="irc.lame-network.local" WS_ORIGIN_ALLOW="irc.lame-network.local"
DEFAULT_BLOCK_HOST_MASK="nothing"
LINK_RECV_PASSWORD="changeme" LINK_RECV_PASSWORD="changeme"
LINK_SEND_PASSWORD="changeme" LINK_SEND_PASSWORD="changeme"
LINK_TIMEOUT="32" LINK_TIMEOUT="32"

View File

@ -9,7 +9,7 @@
requestclientcert="no" requestclientcert="no"
provider="gnutls"> provider="gnutls">
<badhost host="&env.DEFAULT_BLOCK_HOST_MASK;" <badhost host="*@*"
reason="default hostmask block"> reason="default hostmask block">
<exception host="*@127.0.0.1/32" <exception host="*@127.0.0.1/32"

View File

@ -1,9 +1,6 @@
<include directory="/etc/inspircd/modules.conf"> <include file="/etc/inspircd/modules.conf">
<include directory="/etc/inspircd/custom"> <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="169.254.0.0/16" reason="APIPA">
<badip ipmask="10.0.0.0/8" reason="Unclassified (ARPANET)"> <badip ipmask="10.0.0.0/8" reason="Unclassified (ARPANET)">
<badip ipmask="100.64.0.0/10" reason="Unclassified (CGNAT)"> <badip ipmask="100.64.0.0/10" reason="Unclassified (CGNAT)">