From aacaf2e743c81092d572c1bb952b53242195ce4d Mon Sep 17 00:00:00 2001
From: root <paige@paige.bio>
Date: Thu, 7 Nov 2024 19:04:48 -0500
Subject: [PATCH] some fixes to get services working correctly

---
 Dockerfile         | 2 +-
 anope.conf         | 2 +-
 custom/.gitignore  | 9 +--------
 docker-compose.yml | 7 ++-----
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fe585b4..088bbfc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,4 +53,4 @@ VOLUME /var/log/anope
 
 USER anope
 
-ENTRYPOINT ["/usr/local/bin/anope", "--nofork", "--config=/etc/anope/anope.conf", "--dbdir=/var/lib/anope", "--logdir=/var/log/anope", "--moduledir=/usr/local/modules"]
+ENTRYPOINT ["/usr/local/bin/anope", "--nofork", "--confdir=/etc/anope/", "--dbdir=/etc/anope/custom/", "--logdir=/var/log/anope/", "--moduledir=/usr/local/modules/"]
diff --git a/anope.conf b/anope.conf
index 39759d3..cc05f92 100644
--- a/anope.conf
+++ b/anope.conf
@@ -1,7 +1,7 @@
 include
 {
 	type = "file"
-	name = "/etc/anope/include.conf"
+	name = "include.conf"
 }
 
 module { name = "inspircd" }
diff --git a/custom/.gitignore b/custom/.gitignore
index d34eb6a..72e8ffc 100644
--- a/custom/.gitignore
+++ b/custom/.gitignore
@@ -1,8 +1 @@
-motd.txt
-oper.motd.txt
-include.conf
-*.crt
-*.key
-*.pem
-!ca.crt
-!crl.pem
+*
diff --git a/docker-compose.yml b/docker-compose.yml
index d45d01d..20ddffd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   anope:
-    restart: on-failure:3
+    restart: always
     build:
         context: .
         args:
@@ -9,12 +9,9 @@ services:
     network_mode: "host"
     env_file: "config.env"
     volumes:
-        - ./custom:/etc/anope/custom:ro
-        - data:/var/lib/anope
+        - ./custom:/etc/anope/custom:rw
         - ./include.conf:/etc/anope/include.conf:ro
         - log:/var/log/anope
 volumes:
-    data:
-        name: anope_data
     log:
         name: anope_log