diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 21b8a4d..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -config.env -include.conf -motd.txt -oper.motd.txt diff --git a/Dockerfile b/Dockerfile index 6895dd5..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" @@ -306,9 +306,7 @@ ENV JOIN_FLOOD_SPLIT_WAIT="32s" ENV KNOCK_NOTIFY="both" -ENV LIST_MAX_SIZE="512" - -ENV LIST_NORMAL_SIZE="256" +ENV LIST_MAX_SIZE="100" ENV MESSAGE_FLOOD_NOTICE="1.0" @@ -438,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 @@ -448,14 +448,14 @@ RUN mkdir -p /etc/inspircd /var/lib/inspircd /etc/ssl/inspircd /var/log/inspircd ADD inspircd.conf /etc/inspircd -ADD include.default.conf /etc/inspircd/include.conf +ADD modules.conf /etc/inspircd + +ADD help.conf /etc/inspircd + +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 \ @@ -475,4 +475,4 @@ USER inspircd WORKDIR / -CMD /usr/local/bin/inspircd -c /etc/inspircd/inspircd.conf -F +CMD /usr/local/bin/inspircd -c /etc/inspircd/inspircd.conf -F 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/include.default.conf b/custom/include.conf similarity index 82% rename from include.default.conf rename to custom/include.conf index 712b630..e1b9c6c 100644 --- a/include.default.conf +++ b/custom/include.conf @@ -9,7 +9,7 @@ requestclientcert="no" provider="gnutls"> - + + + + + + + + + + + + + + + + diff --git a/custom/motd.txt b/custom/motd.txt new file mode 100644 index 0000000..c4fb5d6 --- /dev/null +++ b/custom/motd.txt @@ -0,0 +1,57 @@ + 0,0 0╗ 0,0 0╗ 0,0 0╗ 0,0 0╗ 0,0 0╗ 0,0 0╗ + 0,0 0╔══0,0 0╗ 0,0 0║ 0,0 0║ 0,0 0╔══0,0 0╗ 0,0 0╔════╝ 0,0 0╔══0,0 0╗ + 0,0 0║ ╚═╝ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ + 0╚0,0 0╗ 0,0 0║ 0,0 0║ 0,0 0╔╝ 0,0 0╗ 0,0 0╔╝ + 0╚═══0,0 0╗ 0,0 0║ 0,0 0║ 0,0 0╔═══╝ 0,0 0╔════╝ 0,0 0╔══0,0 0╗ + 0,0 0╗ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ + 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ + 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ + 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ + 0╚0,0 0╔╝ ╚0,0 0╔╝ 0,0 0║ 0,0 0╗ 0,0 0║ 0,0 0║ +0 ╚════╝ ╚════╝ ╚═╝ ╚══════╝ ╚═╝ ╚═╝ + + 0,12  + 0,12 0,4 0,12  + 0,12 0,4 0,8 0,4 0,8 0,4 0,8 0,4 0,12  +0,12 0,4 0,8 0,4 0,8 0,4 0,8 0,4 0,12  +0,12 0,4 0,8 0,4 0,8 0,4 0,12  + 0,12 0,4 0,8 0,4 0,8 0,4 0,12  + 0,12 0,4 0,12  + 0,12 0,4 0,8 0,4 0,12  + 0,12 0,4 0,8 0,4 0,8 0,4 0,12  + 0,12 0,4 0,12  + 0,12 0,4 0,8 0,4 0,12  + 0,12 0,4 0,8 0,4 0,12  + 0,12 0,4 0,12  + 0,12 0,4 0,12  + 0,12  + 0,12  + + 0,0 0╗ 0,0 0╗ 0,0 0╗ 0,0 0╗ 0,0 0╗ + 0,0 0╔═0,0 0╗ 0,0 0║ 0,0 0╔════╝ 0,0 0╔═╝ 0,0 0╔══0,0 0╗ + 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ ╚═╝ + 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0╗ 0,0 0║ ╚0,0 0╗ + 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0╔════╝ 0,0 0║ ╚═══0,0 0╗ + 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0 0║ 0,0  0,0 0║ + 0,0 0║ ╚0,0 0║ 0,0 0╗ 0,0 0║ ╚0,0 0╔╝ + 0╚═╝ ╚════╝ ╚══════╝ ╚═╝ ╚════╝ + +4─────────┤ 0THE WILD WILD WEST OF IRC 4├───────── + +14• 7 Round-robin irc.supernets.org 14(IPv4/IPv6) +14• 7 Onion 14removed until further notice + +14• 7 Ports 6660-6669 & 7000 +14• 7SSL/TLS Ports 6697 & 9000 + +14• 7 Mail 12admin@supernets.org +14• 7 Git 12https://git.supernets.org +14• 7 Twitter 12https://twitter.com/super_nets +14• 7 Website 12https://supernets.org/ + +4─────────┤ 0MOST DANGEROUS IRC NETWORK 4├──────── + +14• 7This is a hostile chat environment +14• 7Do not disrupt the orderly operation of the network +14• 7No distribution of child pornography +14• 7See /RULES for a list of network rules diff --git a/oper.motd.txt b/custom/oper.motd.txt similarity index 100% rename from oper.motd.txt rename to custom/oper.motd.txt diff --git a/docker-compose.linked.yml b/docker-compose.linked.yml deleted file mode 100644 index eeb3ca7..0000000 --- a/docker-compose.linked.yml +++ /dev/null @@ -1,24 +0,0 @@ -services: - ircd_linked: - build: - context: . - args: - BUILD_SERVER_NAME: ${SERVER_NAME} - image: inspi4 - network_mode: "host" - env_file: "config.env" - command: /usr/local/bin/inspircd -c /etc/inspircd/inspircd.conf -F - volumes: - - ./motd.txt:/etc/inspircd/motd.txt:ro - - ./oper.motd.txt:/etc/inspircd/oper.motd.txt:ro - - ./include.conf:/etc/inspircd/include.conf:ro - - ssl:/etc/ssl/inspircd - - data:/var/lib/inspircd - - log:/var/log/inspircd -volumes: - data: - name: inspi4_data - ssl: - name: inspi4_ssl - log: - name: inspi4_log diff --git a/docker-compose.standalone.yml b/docker-compose.standalone.yml deleted file mode 100644 index 19a3533..0000000 --- a/docker-compose.standalone.yml +++ /dev/null @@ -1,20 +0,0 @@ -services: - ircd: - build: - context: . - args: - BUILD_SERVER_NAME: ${SERVER_NAME} - image: inspi4 - network_mode: "host" - env_file: "config.env" - volumes: - - ssl:/etc/ssl/inspircd - - data:/var/lib/inspircd - - log:/var/log/inspircd -volumes: - data: - name: inspi4_data - ssl: - name: inspi4_ssl - log: - name: inspi4_log diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..b76167f --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,22 @@ +services: + leaf: + build: + context: . + args: + BUILD_SERVER_NAME: ${SERVER_NAME} + image: inspi4 + network_mode: "host" + env_file: "config.env" + command: /usr/local/bin/inspircd -c /etc/inspircd/inspircd.conf -F + volumes: + - ./custom:/etc/inspircd/custom:ro + - ssl:/etc/ssl/inspircd + - data:/var/lib/inspircd + - log:/var/log/inspircd +volumes: + data: + name: inspi4_data + ssl: + name: inspi4_ssl + log: + name: inspi4_log diff --git a/help.conf b/help.conf new file mode 100644 index 0000000..2297804 --- /dev/null +++ b/help.conf @@ -0,0 +1,640 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/inspircd.conf b/inspircd.conf index f6a29ce..4dedb3e 100644 --- a/inspircd.conf +++ b/inspircd.conf @@ -1,8 +1,144 @@ - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -163,155 +341,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -350,45 +384,7 @@ - - - - - - - - - - - - - - - - @@ -633,13 +625,6 @@ - - - @@ -653,37 +638,6 @@ - - - - - - - - - - - @@ -691,401 +645,7 @@ privmsg="&env.MESSAGE_FLOOD_PRIVMSG;" tagmsg="&env.MESSAGE_FLOOD_TAG_MSG;"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1109,37 +669,12 @@ - + - @@ -1150,30 +685,12 @@ - - - - - - - - + @@ -1238,22 +744,6 @@ - - - - - - - @@ -1263,9 +753,7 @@ - + @@ -1278,646 +766,3 @@ serverzombietime="&env.ZOMBIE_SERVER_TIME;"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules.conf b/modules.conf new file mode 100644 index 0000000..506374d --- /dev/null +++ b/modules.conf @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/motd.txt b/motd.txt deleted file mode 100644 index 39cdd0d..0000000 --- a/motd.txt +++ /dev/null @@ -1 +0,0 @@ --