This commit is contained in:
root 2025-01-05 14:06:34 +00:00
parent 91d3b05c1f
commit 5539c4b8bd
7 changed files with 14 additions and 18 deletions

2
.gitignore vendored
View File

@ -1,3 +1 @@
include.conf
config.env config.env
atheme.db

View File

@ -32,22 +32,22 @@ RUN mv /usr/local/etc /usr/local/etc_old
RUN ln -sf /etc/atheme /usr/local/etc RUN ln -sf /etc/atheme /usr/local/etc
ADD atheme.conf /etc/atheme ADD data/atheme.conf /etc/atheme
ADD include.default.conf /etc/atheme/include.conf ADD data/include.default.conf /etc/atheme/include.conf
RUN chown -R atheme:atheme /etc/atheme /etc/ssl/atheme /var/log/atheme RUN chown -R atheme:atheme /etc/atheme /etc/ssl/atheme /var/log/atheme
WORKDIR / WORKDIR /
RUN rm -rf /tmp/atheme
USER atheme USER atheme
RUN /usr/local/bin/atheme-services -b ; true RUN /usr/local/bin/atheme-services -b ; true
VOLUME /etc/atheme VOLUME /etc/atheme
VOLUME /etc/ssl/atheme
VOLUME /var/log/atheme VOLUME /var/log/atheme
ENTRYPOINT ["/usr/local/bin/atheme-services", "-p", "/tmp/atheme.pid", "-n"] ENTRYPOINT ["/usr/local/bin/atheme-services", "-p", "/tmp/atheme.pid", "-n"]

2
data/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
services.*
include.conf

View File

@ -1,4 +1,4 @@
loadmodule "/usr/local/modules/security/cmdperm"; # loadmodule "/usr/local/modules/security/cmdperm"; https://github.com/atheme/atheme/issues/937
loadmodule "/usr/local/modules/protocol/inspircd"; loadmodule "/usr/local/modules/protocol/inspircd";
# loadmodule "/usr/local/modules/protocol/mixin_nohalfops"; # loadmodule "/usr/local/modules/protocol/mixin_nohalfops";
# loadmodule "/usr/local/modules/protocol/mixin_noholdnick"; # loadmodule "/usr/local/modules/protocol/mixin_noholdnick";
@ -589,8 +589,8 @@ operclass "sra" {
general:admin; general:admin;
}; };
privs { privs {
# operserv:massakill; operserv:massakill;
# operserv:akill-anymask; operserv:akill-anymask;
operserv:noop; operserv:noop;
operserv:grant; operserv:grant;
}; };

View File

@ -34,7 +34,7 @@ operator "admin" {
}; };
general { general {
permissive_mode; # https://github.com/atheme/atheme/issues/937 # permissive_mode; # https://github.com/atheme/atheme/issues/937
helpchan = "#help"; helpchan = "#help";
helpurl = "https://www.supernets.org"; helpurl = "https://www.supernets.org";
verbose_wallops; verbose_wallops;

View File

@ -8,12 +8,8 @@ services:
network_mode: "host" network_mode: "host"
env_file: "config.env" env_file: "config.env"
volumes: volumes:
- data:/etc/atheme - ./data:/etc/atheme
- ./include.conf:/usr/local/etc/include.conf:ro
- ./atheme.conf:/usr/local/etc/atheme.conf:ro
- log:/var/log/atheme - log:/var/log/atheme
volumes: volumes:
data:
name: atheme_data
log: log:
name: atheme_log name: atheme_log

View File

@ -6,9 +6,9 @@ services:
image: stunnel image: stunnel
network_mode: "host" network_mode: "host"
volumes: volumes:
- ../custom/ca.crt:/ca.crt:ro - ../ssl/ca.crt:/ca.crt:ro
- ../custom/server.crt:/server.crt:ro - ../ssl/server.crt:/server.crt:ro
- ../custom/server.key:/server.key:ro - ../ssl/server.key:/server.key:ro
- ./stunnel.conf:/etc/stunnel/stunnel.conf:ro - ./stunnel.conf:/etc/stunnel/stunnel.conf:ro
ulimits: ulimits:
nofile: nofile: