clean up

.gitignore

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

Dockerfile

@@ -32,22 +32,22 @@ RUN mv /usr/local/etc /usr/local/etc_old
 
 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
 
 WORKDIR /
 
+RUN rm -rf /tmp/atheme
+
 USER atheme 
 
 RUN /usr/local/bin/atheme-services -b ; true
 
 VOLUME /etc/atheme
 
-VOLUME /etc/ssl/atheme
-
 VOLUME /var/log/atheme
 
 ENTRYPOINT ["/usr/local/bin/atheme-services", "-p", "/tmp/atheme.pid", "-n"]

data/.gitignore

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

data/atheme.conf

@@ -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/mixin_nohalfops";
 # loadmodule "/usr/local/modules/protocol/mixin_noholdnick";
@@ -589,8 +589,8 @@ operclass "sra" {
 		general:admin;
 	};
 	privs {
-		# operserv:massakill;
-		# operserv:akill-anymask;
+		operserv:massakill;
+		operserv:akill-anymask;
 		operserv:noop;
 		operserv:grant;
 	};

data/include.default.conf

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

docker-compose.yml

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

stunnel/docker-compose.yml

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