Merge doveauth and filtermail folders

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"

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",

scripts/test.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-pushd doveauth/src/doveauth
+pushd chatmaild/src/chatmaild
 ../../venv/bin/pytest
 popd