From 40ad67dc20a8b2d40d47d1e9456459424cbe3e74 Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Sun, 15 Oct 2023 16:04:38 +0000
Subject: [PATCH] Merge doveauth and filtermail folders

---
 chatmaild/pyproject.toml                                    | 6 +++---
 chatmaild/src/{doveauth => chatmaild}/__init__.py           | 0
 chatmaild/src/{doveauth => chatmaild}/database.py           | 0
 chatmaild/src/{doveauth => chatmaild}/dictproxy.py          | 0
 .../src/{doveauth => chatmaild}/doveauth-dictproxy.service  | 0
 chatmaild/src/{doveauth => chatmaild}/doveauth.py           | 0
 chatmaild/src/{filtermail => chatmaild}/filtermail.py       | 0
 chatmaild/src/{filtermail => chatmaild}/filtermail.service  | 0
 chatmaild/src/{doveauth => chatmaild}/test_doveauth.py      | 0
 chatmaild/src/filtermail/__init__.py                        | 0
 deploy-chatmail/src/deploy_chatmail/__init__.py             | 4 ++--
 scripts/test.sh                                             | 2 +-
 12 files changed, 6 insertions(+), 6 deletions(-)
 rename chatmaild/src/{doveauth => chatmaild}/__init__.py (100%)
 rename chatmaild/src/{doveauth => chatmaild}/database.py (100%)
 rename chatmaild/src/{doveauth => chatmaild}/dictproxy.py (100%)
 rename chatmaild/src/{doveauth => chatmaild}/doveauth-dictproxy.service (100%)
 rename chatmaild/src/{doveauth => chatmaild}/doveauth.py (100%)
 rename chatmaild/src/{filtermail => chatmaild}/filtermail.py (100%)
 rename chatmaild/src/{filtermail => chatmaild}/filtermail.service (100%)
 rename chatmaild/src/{doveauth => chatmaild}/test_doveauth.py (100%)
 delete mode 100644 chatmaild/src/filtermail/__init__.py

diff --git a/chatmaild/pyproject.toml b/chatmaild/pyproject.toml
index 09ffc22..56060f0 100644
--- a/chatmaild/pyproject.toml
+++ b/chatmaild/pyproject.toml
@@ -10,9 +10,9 @@ dependencies = [
 ]
 
 [project.scripts]
-doveauth = "doveauth.doveauth:main"
-doveauth-dictproxy = "doveauth.dictproxy:main"
-filtermail = "filtermail.filtermail:main"
+doveauth = "chatmaild.doveauth:main"
+doveauth-dictproxy = "chatmaild.dictproxy:main"
+filtermail = "chatmaild.filtermail:main"
 
 [tool.pytest.ini_options]
 addopts = "-v -ra --strict-markers"
diff --git a/chatmaild/src/doveauth/__init__.py b/chatmaild/src/chatmaild/__init__.py
similarity index 100%
rename from chatmaild/src/doveauth/__init__.py
rename to chatmaild/src/chatmaild/__init__.py
diff --git a/chatmaild/src/doveauth/database.py b/chatmaild/src/chatmaild/database.py
similarity index 100%
rename from chatmaild/src/doveauth/database.py
rename to chatmaild/src/chatmaild/database.py
diff --git a/chatmaild/src/doveauth/dictproxy.py b/chatmaild/src/chatmaild/dictproxy.py
similarity index 100%
rename from chatmaild/src/doveauth/dictproxy.py
rename to chatmaild/src/chatmaild/dictproxy.py
diff --git a/chatmaild/src/doveauth/doveauth-dictproxy.service b/chatmaild/src/chatmaild/doveauth-dictproxy.service
similarity index 100%
rename from chatmaild/src/doveauth/doveauth-dictproxy.service
rename to chatmaild/src/chatmaild/doveauth-dictproxy.service
diff --git a/chatmaild/src/doveauth/doveauth.py b/chatmaild/src/chatmaild/doveauth.py
similarity index 100%
rename from chatmaild/src/doveauth/doveauth.py
rename to chatmaild/src/chatmaild/doveauth.py
diff --git a/chatmaild/src/filtermail/filtermail.py b/chatmaild/src/chatmaild/filtermail.py
similarity index 100%
rename from chatmaild/src/filtermail/filtermail.py
rename to chatmaild/src/chatmaild/filtermail.py
diff --git a/chatmaild/src/filtermail/filtermail.service b/chatmaild/src/chatmaild/filtermail.service
similarity index 100%
rename from chatmaild/src/filtermail/filtermail.service
rename to chatmaild/src/chatmaild/filtermail.service
diff --git a/chatmaild/src/doveauth/test_doveauth.py b/chatmaild/src/chatmaild/test_doveauth.py
similarity index 100%
rename from chatmaild/src/doveauth/test_doveauth.py
rename to chatmaild/src/chatmaild/test_doveauth.py
diff --git a/chatmaild/src/filtermail/__init__.py b/chatmaild/src/filtermail/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/deploy-chatmail/src/deploy_chatmail/__init__.py b/deploy-chatmail/src/deploy_chatmail/__init__.py
index 05b6df8..16b9952 100644
--- a/deploy-chatmail/src/deploy_chatmail/__init__.py
+++ b/deploy-chatmail/src/deploy_chatmail/__init__.py
@@ -35,7 +35,7 @@ def _install_chatmaild() -> None:
         )
 
         files.put(
-            src=importlib.resources.files("doveauth")
+            src=importlib.resources.files("chatmaild")
             .joinpath("doveauth-dictproxy.service")
             .open("rb"),
             dest="/etc/systemd/system/doveauth-dictproxy.service",
@@ -58,7 +58,7 @@ def _install_chatmaild() -> None:
         )
 
         files.put(
-            src=importlib.resources.files("filtermail")
+            src=importlib.resources.files("chatmaild")
             .joinpath("filtermail.service")
             .open("rb"),
             dest="/etc/systemd/system/filtermail.service",
diff --git a/scripts/test.sh b/scripts/test.sh
index 01ca14d..64e3bb7 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-pushd doveauth/src/doveauth
+pushd chatmaild/src/chatmaild
 ../../venv/bin/pytest
 popd