diff --git a/Dockerfile b/Dockerfile index 6895dd5..dd0b3a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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" @@ -448,13 +446,17 @@ 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 +ADD oper.motd.txt /etc/inspircd/oper.motd.txt RUN openssl genrsa -out /etc/ssl/inspircd/server.key @@ -475,4 +477,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/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/include.default.conf b/include.default.conf deleted file mode 100644 index 712b630..0000000 --- a/include.default.conf +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/inspircd.conf b/inspircd.conf index f6a29ce..c3420f5 100644 --- a/inspircd.conf +++ b/inspircd.conf @@ -1,8 +1,147 @@ - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -163,155 +344,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -350,45 +387,7 @@ - - - - - - - - - - - - - - - - @@ -633,13 +628,6 @@ - - - @@ -653,37 +641,6 @@ - - - - - - - - - - - @@ -691,401 +648,7 @@ privmsg="&env.MESSAGE_FLOOD_PRIVMSG;" tagmsg="&env.MESSAGE_FLOOD_TAG_MSG;"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1109,37 +672,12 @@ - + - @@ -1150,30 +688,12 @@ - - - - - - - - + @@ -1238,22 +747,6 @@ - - - - - - - @@ -1263,9 +756,7 @@ - + @@ -1278,646 +769,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 @@ -- diff --git a/oper.motd.txt b/oper.motd.txt deleted file mode 100644 index 39cdd0d..0000000 --- a/oper.motd.txt +++ /dev/null @@ -1 +0,0 @@ --