From 464238a25d9a80f897b4a648c5cd85adbf69effe Mon Sep 17 00:00:00 2001 From: root Date: Wed, 6 Nov 2024 18:08:00 +0000 Subject: [PATCH] last minute fixes --- Dockerfile | 34 +++++++++++++++++++++++++++------- config.env | 26 -------------------------- config.env.example | 1 - docker-compose.yml | 1 - include.conf.example | 16 +++++++++++++--- inspircd.conf | 35 ++++++++--------------------------- 6 files changed, 48 insertions(+), 65 deletions(-) delete mode 100644 config.env diff --git a/Dockerfile b/Dockerfile index 480cd3e..1dadfd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,23 +18,23 @@ ENV SASL_TARGET="service.lame-network.local" ENV ADMIN_PASSWORD="changeme" -ENV COMMAND_RATE="128000" +ENV COMMAND_RATE="1000" ENV FAKE_LAG="off" -ENV HARD_SENDQ="1M" +ENV HARD_SENDQ="1048576" ENV MAX_CHANS="256" ENV PING_FREQ="64" -ENV RECVQ="8K" +ENV RECVQ="4096" -ENV SOFT_SENDQ="8192" +ENV SOFT_SENDQ="4096" -ENV COMMAND_RATE_THRESHOLD="128" +ENV COMMAND_RATE_THRESHOLD="10" -ENV COMMAND_RATE_THRESHOLD_TIMEOUT="16" +ENV PARTIAL_CONNECT_TIMEOUT="16s" ENV USE_CONN_FLOOD="no" @@ -412,6 +412,24 @@ ENV AUDITORIUM_OPER_CAN_SEE="yes" ENV AUDITORIUM_OP_VISIBLE="no" +ENV IPV4_CLONE="32" + +ENV IPV6_CLONE="64" + +ENV ROTATE_LOG_PERIOD="86400" + +ENV REGEX_TYPE="ecmascript" + +ENV ALLOW_CORE_UNLOAD="no" + +ENV ANNOUNCE_INVITES="dynamic" + +ENV XLINEDB_SAVE_PERIOD="128s" + +ENV PERMCHAN_LIST_MODES="yes" + +ENV PERMCHANDB_SAVE_PERIOD="128s" + RUN apt -y update RUN apt -y install coreutils perl git automake autoconf build-essential libpcre2-dev rapidjson-dev libcurl4-gnutls-dev libargon2-dev libmaxminddb-dev libldap2-dev rapidjson-dev libmysqlclient-dev libmysqlclient-dev default-libmysqlclient-dev libpq-dev libre2-dev gnutls-dev libsqlite3-dev libmbedtls-dev libqrencode-dev libpcre3-dev libtre-dev pkg-config libwww-perl @@ -471,6 +489,8 @@ RUN openssl x509 -req -days 365 -in /etc/ssl/inspircd/server.csr -signkey /etc/s RUN chown -R inspircd:inspircd /etc/inspircd /etc/ssl/inspircd /var/lib/inspircd /var/log/inspircd +VOLUME /etc/inspircd/custom + VOLUME /etc/ssl/inspircd VOLUME /var/lib/inspircd @@ -481,4 +501,4 @@ USER inspircd WORKDIR / -CMD /usr/local/bin/inspircd -c /etc/inspircd/inspircd.conf -F +ENTRYPOINT ["/usr/local/bin/inspircd", "-c", "/etc/inspircd/inspircd.conf", "-F"] diff --git a/config.env b/config.env deleted file mode 100644 index f11b872..0000000 --- a/config.env +++ /dev/null @@ -1,26 +0,0 @@ -ADMIN_EMAIL="no-reply@supernets.org" -SID="01B" -SERVER_NAME="lux.supernets.org" -NETWORK_NAME="SuperNETs" -STS_HOST="irc.supernets.org" -SASL_TARGET="services.supernets.org" -ADMIN_PASSWORD="YzUzZmVmYjA0YjQwZjA5MjViYmNmYTFkOTQ0YzVmMzE3ODM3ZjI1MWYxZmY3ZGM3" -PORT="6667" -SSL_PORT="6697" -SERVER_SSL_PORT="7000" -HTTP_ACL_PASSWORD="MTU3OTI1MDgyNzczYzZlNTkyOTZlZjY2MGFlNjU4YmI0OGEwNmU5Nzk4YmJlOWYz" -HTTP_ACL_USERNAME="supernets" -ROLE_PLAY_VHOST="roleplay/supernets.org" -CUSTOM_VERSION="c l a n d e s t i n e" -NET_ADMIN_VHOST="admin/supernets.org" -GLOBAL_OP_VHOST="oper/supernets.org" -HELPER_VHOST="helper/supernets.org" -SERVICES_ULINE="services.supernets.org" -WS_ORIGIN_ALLOW="lux.supernets.org" -LINK_RECV_PASSWORD="MTg4ZDNjNTE5ZDU2MTQxZDdmZWNmNjU1ZjUzY2NkMWM3M2ZmMTY2NmFmYWJhOWIw" -LINK_SEND_PASSWORD="MTg4ZDNjNTE5ZDU2MTQxZDdmZWNmNjU1ZjUzY2NkMWM3M2ZmMTY2NmFmYWJhOWIw" -LINK_TIMEOUT="32" -CLOAK_KEY="NzY2NDM5NTkyOTVmOTdmZDkzODA2NDk5MWRmNjVjZjRhMzcyOGZjMTgwY2YwMGIz" -TOR_PREFIX="tor/" -DEFAULT_USER_MODES="x" -SSL_USER_MODES="x" diff --git a/config.env.example b/config.env.example index c6eead7..16f8917 100644 --- a/config.env.example +++ b/config.env.example @@ -22,6 +22,5 @@ LINK_SEND_PASSWORD="changeme" LINK_TIMEOUT="32" CLOAK_KEY="changemechangemechangemechangeme" CLOAK_SUFFIX=".hidden" -TOR_PREFIX="tor/" DEFAULT_USER_MODES="x" SSL_USER_MODES="x" diff --git a/docker-compose.yml b/docker-compose.yml index 1f66f02..f18f6d7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,6 @@ services: 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 diff --git a/include.conf.example b/include.conf.example index e00a3cc..8c298ae 100644 --- a/include.conf.example +++ b/include.conf.example @@ -86,7 +86,7 @@ # recvq="&env.RECVQ;" # softsendq="&env.SOFT_SENDQ;" # threshold="&env.COMMAND_RATE_THRESHOLD;" -# timeout="&env.COMMAND_RATE_THRESHOLD_TIMEOUT;" +# timeout="&env.PARTIAL_CONNECT_TIMEOUT;" # usecloak="yes" # useconnflood="&env.USE_CONN_FLOOD;" # usednsbl="no" @@ -122,7 +122,7 @@ # recvq="&env.RECVQ;" # softsendq="&env.SOFT_SENDQ;" # threshold="&env.COMMAND_RATE_THRESHOLD;" -# timeout="&env.COMMAND_RATE_THRESHOLD_TIMEOUT;" +# timeout="&env.PARTIAL_CONNECT_TIMEOUT;" # usecloak="yes" # useconnflood="&env.USE_CONN_FLOOD;" # usednsbl="no" @@ -182,7 +182,7 @@ recvq="&env.RECVQ;" softsendq="&env.SOFT_SENDQ;" threshold="&env.COMMAND_RATE_THRESHOLD;" - timeout="&env.COMMAND_RATE_THRESHOLD_TIMEOUT;" + timeout="&env.PARTIAL_CONNECT_TIMEOUT;" useconnflood="&env.USE_CONN_FLOOD;" usednsbl="&env.USE_DNSBL;" useident="&env.USE_IDENT;" @@ -252,6 +252,16 @@ forwardmsg="NOTICE $nick :*** Forwarding PASS to $nickrequired" nick="NICKSERV"> +# + + + +# + +# + # # diff --git a/inspircd.conf b/inspircd.conf index 1324c6a..285540a 100644 --- a/inspircd.conf +++ b/inspircd.conf @@ -52,7 +52,7 @@ - + - - - - - - - - - @@ -527,18 +516,12 @@ noisy="&env.OVERRIDE_NOISY;" requirekey="&env.OVERRIDE_REQUIRE_KEY;"> - - - - + listmodes="&env.PERMCHAN_LIST_MODES;" + saveperiod="&env.PERMCHANDB_SAVE_PERIOD;"> @@ -555,7 +538,7 @@ matchonnickchange="&env.RLINE_MATCH_ON_NICK_CHANGE;" zlineonmatch="&env.RLINE_ZLINE_ON_MATCH;"> - + - - - + @@ -597,7 +578,7 @@ + saveperiod="&env.XLINEDB_SAVE_PERIOD;">