From 5539c4b8bdbf03d13d6625141991d30a742da8aa Mon Sep 17 00:00:00 2001
From: root <paige@paige.bio>
Date: Sun, 5 Jan 2025 14:06:34 +0000
Subject: [PATCH] clean up

---
 .gitignore                                        | 2 --
 Dockerfile                                        | 8 ++++----
 data/.gitignore                                   | 2 ++
 atheme.conf => data/atheme.conf                   | 6 +++---
 include.default.conf => data/include.default.conf | 2 +-
 docker-compose.yml                                | 6 +-----
 stunnel/docker-compose.yml                        | 6 +++---
 7 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 data/.gitignore
 rename atheme.conf => data/atheme.conf (99%)
 rename include.default.conf => data/include.default.conf (96%)

diff --git a/.gitignore b/.gitignore
index 10501ce..2549b3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-include.conf
 config.env
-atheme.db
diff --git a/Dockerfile b/Dockerfile
index 8e46b0b..aba90fd 100644
--- a/Dockerfile
+++ b/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"]
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 0000000..4c7d0b1
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,2 @@
+services.*
+include.conf
diff --git a/atheme.conf b/data/atheme.conf
similarity index 99%
rename from atheme.conf
rename to data/atheme.conf
index f775fbd..36da3ab 100644
--- a/atheme.conf
+++ b/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;
 	};
diff --git a/include.default.conf b/data/include.default.conf
similarity index 96%
rename from include.default.conf
rename to data/include.default.conf
index b9fd044..841285d 100644
--- a/include.default.conf
+++ b/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;
diff --git a/docker-compose.yml b/docker-compose.yml
index 7de918a..ef64158 100644
--- a/docker-compose.yml
+++ b/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
diff --git a/stunnel/docker-compose.yml b/stunnel/docker-compose.yml
index 5e539d9..4d245d8 100644
--- a/stunnel/docker-compose.yml
+++ b/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: