show PATH env

.github/workflows/ci.yaml

@@ -31,7 +31,7 @@ jobs:
         run: cmdeploy fmt -v 
 
       - name: run deploy-chatmail offline tests 
-        run: pytest --pyargs cmdeploy 
+        run: pytest tests
 
       - name: initialize with chatmail domain
         run: cmdeploy init chat.example.org  

chatmaild/src/chatmaild/config.py

@@ -9,7 +9,7 @@ def read_config(inipath):
 class Config:
     def __init__(self, inipath, params):
         self._inipath = inipath
-        self.mail_domain = params["mail_domain"]
+        self.mailname = self.mail_domain = params["mailname"]
         self.max_user_send_per_minute = int(params["max_user_send_per_minute"])
         self.filtermail_smtp_port = int(params["filtermail_smtp_port"])
         self.postfix_reinject_port = int(params["postfix_reinject_port"])
@@ -23,14 +23,12 @@ class Config:
         return open(self._inipath, "rb")
 
 
-def write_initial_config(inipath, mail_domain):
+def write_initial_config(inipath, mailname):
     from importlib.resources import files
 
     inidir = files(__package__).joinpath("ini")
-    content = (
-        inidir.joinpath("chatmail.ini.f").read_text().format(mail_domain=mail_domain)
-    )
-    if mail_domain.endswith(".testrun.org"):
+    content = inidir.joinpath("chatmail.ini.f").read_text().format(mailname=mailname)
+    if mailname.endswith(".testrun.org"):
         override_inipath = inidir.joinpath("override-testrun.ini")
         privacy = iniconfig.IniConfig(override_inipath)["privacy"]
         lines = []

chatmaild/src/chatmaild/ini/chatmail.ini.f

@@ -1,7 +1,7 @@
 [params]
 
 # mail domain (MUST be set to fully qualified chat mail domain)
-mail_domain = {mail_domain}
+mailname = {mailname}
 
 #
 # If you only do private test deploys, you don't need to modify any settings below

chatmaild/src/chatmaild/newemail.py

@@ -5,7 +5,7 @@
 import json
 import random
 
-mail_domain_path = "/etc/mailname"
+mailname_path = "/etc/mailname"
 
 
 def create_newemail_dict(domain):
@@ -16,7 +16,7 @@ def create_newemail_dict(domain):
 
 
 def print_new_account():
-    domain = open(mail_domain_path).read().strip()
+    domain = open(mailname_path).read().strip()
     creds = create_newemail_dict(domain=domain)
 
     print("Content-Type: application/json")

chatmaild/src/chatmaild/tests/plugin.py

@@ -13,8 +13,8 @@ from chatmaild.config import read_config, write_initial_config
 def make_config(tmp_path):
     inipath = tmp_path.joinpath("chatmail.ini")
 
-    def make_conf(mail_domain):
-        write_initial_config(inipath, mail_domain=mail_domain)
+    def make_conf(mailname):
+        write_initial_config(inipath, mailname=mailname)
         return read_config(inipath)
 
     return make_conf
@@ -27,7 +27,7 @@ def example_config(make_config):
 
 @pytest.fixture
 def maildomain(example_config):
-    return example_config.mail_domain
+    return example_config.mailname
 
 
 @pytest.fixture

chatmaild/src/chatmaild/tests/test_config.py

@@ -3,7 +3,7 @@ from chatmaild.config import read_config
 
 def test_read_config_basic(make_config):
     config = make_config("chat.example.org")
-    assert config.mail_domain == "chat.example.org"
+    assert config.mailname == "chat.example.org"
     assert not config.privacy_supervisor and not config.privacy_mail
     assert not config.privacy_pdo and not config.privacy_postal
 
@@ -11,12 +11,12 @@ def test_read_config_basic(make_config):
     inipath.write_text(inipath.read_text().replace("60", "37"))
     config = read_config(inipath)
     assert config.max_user_send_per_minute == 37
-    assert config.mail_domain == "chat.example.org"
+    assert config.mailname == "chat.example.org"
 
 
 def test_read_config_testrun(make_config):
     config = make_config("something.testrun.org")
-    assert config.mail_domain == "something.testrun.org"
+    assert config.mailname == "something.testrun.org"
     assert len(config.privacy_postal.split("\n")) > 1
     assert len(config.privacy_supervisor.split("\n")) > 1
     assert len(config.privacy_pdo.split("\n")) > 1

chatmaild/src/chatmaild/tests/test_newmail.py

@@ -18,7 +18,7 @@ def test_create_newemail_dict():
 def test_print_new_account(capsys, monkeypatch, maildomain, tmpdir):
     p = tmpdir.join("mailname")
     p.write(maildomain)
-    monkeypatch.setattr(chatmaild.newemail, "mail_domain_path", str(p))
+    monkeypatch.setattr(chatmaild.newemail, "mailname_path", str(p))
     print_new_account()
     out, err = capsys.readouterr()
     lines = out.split("\n")

deploy-chatmail/pyproject.toml

@@ -3,8 +3,8 @@ requires = ["setuptools>=68"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "cmdeploy"
-version = "0.2"
+name = "deploy-chatmail"
+version = "0.1"
 dependencies = [
   "pyinfra",
   "pillow",
@@ -22,11 +22,10 @@ dependencies = [
 ]
 
 [project.scripts]
-cmdeploy = "cmdeploy.cmdeploy:main"
+cmdeploy = "deploy_chatmail.cmdeploy:main"
 
 [project.entry-points.pytest11]
 "chatmaild.testplugin" = "chatmaild.tests.plugin"
-"cmdeploy.testplugin" = "cmdeploy.tests.plugin"
 
 [tool.pytest.ini_options]
 addopts = "-v -ra --strict-markers"

deploy-chatmail/src/deploy_chatmail/__init__.py

@@ -195,7 +195,7 @@ def _install_mta_sts_daemon() -> bool:
     server.shell(
         name="install postfix-mta-sts-resolver with pip",
         commands=[
-            "python3 -m virtualenv /usr/local/lib/postfix-mta-sts-resolver",
+            "python3 -m venv /usr/local/lib/postfix-mta-sts-resolver",
             "/usr/local/lib/postfix-mta-sts-resolver/bin/pip install postfix-mta-sts-resolver",
         ],
     )
@@ -347,8 +347,8 @@ def _configure_nginx(domain: str, debug: bool = False) -> bool:
 
 
 def check_config(config):
-    mail_domain = config.mail_domain
-    if mail_domain != "testrun.org" and not mail_domain.endswith(".testrun.org"):
+    mailname = config.mailname
+    if mailname != "testrun.org" and not mailname.endswith(".testrun.org"):
         blocked_words = "merlinux schmieder testrun.org".split()
         for value in config.__dict__.values():
             if any(x in value for x in blocked_words):

deploy-chatmail/src/deploy_chatmail/cmdeploy.py

@@ -52,17 +52,17 @@ def run_cmd(args, out):
     """Deploy chatmail services on the remote server."""
 
     env = os.environ.copy()
-    env["CHATMAIL_DOMAIN"] = args.config.mail_domain
-    deploy_path = "cmdeploy/src/cmdeploy/deploy.py"
+    env["CHATMAIL_DOMAIN"] = args.config.mailname
+    deploypy = "deploy-chatmail/src/deploy_chatmail/deploy.py"
     pyinf = "pyinfra --dry" if args.dry_run else "pyinfra"
-    cmd = f"{pyinf} --ssh-user root {args.config.mail_domain} {deploy_path}"
+    cmd = f"{pyinf} --ssh-user root {args.config.mailname} {deploypy}"
     out.check_call(cmd, env=env)
 
 
 def dns_cmd(args, out):
     """Generate dns zone file."""
     template = importlib.resources.files(__package__).joinpath("chatmail.zone.f")
-    ssh = f"ssh root@{args.config.mail_domain}"
+    ssh = f"ssh root@{args.config.mailname}"
 
     def read_dkim_entries(entry):
         lines = []
@@ -77,16 +77,16 @@ def dns_cmd(args, out):
     dkim_entry = read_dkim_entries(out.shell_output(f"{ssh} -- opendkim-genzone -F"))
 
     out(
-        f"[writing {args.config.mail_domain} zone data (using space as separator) to stdout output]",
+        f"[writing {args.config.mailname} zone data (using space as separator) to stdout output]",
         green=True,
     )
     print(
         template.read_text()
         .format(
             acme_account_url=acme_account_url,
-            email=f"root@{args.config.mail_domain}",
+            email=f"root@{args.config.mailname}",
             sts_id=datetime.datetime.now().strftime("%Y%m%d%H%M"),
-            chatmail_domain=args.config.mail_domain,
+            chatmail_domain=args.config.mailname,
             dkim_entry=dkim_entry,
         )
         .strip()
@@ -96,9 +96,9 @@ def dns_cmd(args, out):
 def status_cmd(args, out):
     """Display status for online chatmail instance."""
 
-    ssh = f"ssh root@{args.config.mail_domain}"
+    ssh = f"ssh root@{args.config.mailname}"
 
-    out.green(f"chatmail domain: {args.config.mail_domain}")
+    out.green(f"chatmail domain: {args.config.mailname}")
     if args.config.privacy_mail:
         out.green("privacy settings: present")
     else:
@@ -122,7 +122,7 @@ def test_cmd(args, out):
 
     pytest_path = shutil.which("pytest")
     ret = out.run_ret(
-        [pytest_path, "cmdeploy/src/", "-n4", "-rs", "-x", "-vrx", "--durations=5"]
+        [pytest_path, "tests/", "-n4", "-rs", "-x", "-vrx", "--durations=5"]
     )
     return ret
 
@@ -147,7 +147,11 @@ def fmt_cmd_options(parser):
 def fmt_cmd(args, out):
     """Run formattting fixes (fuff and black) on all chatmail source code."""
 
-    sources = [str(importlib.resources.files(x)) for x in ("chatmaild", "cmdeploy")]
+    chatmaild = importlib.resources.files("chatmaild")
+    deploy_chatmail = importlib.resources.files("deploy_chatmail")
+    tests = deploy_chatmail.joinpath("../../../tests")
+    sources = list(str(x) for x in [chatmaild, deploy_chatmail, tests])
+
     black_args = [shutil.which("black")]
     ruff_args = [shutil.which("ruff")]
 
@@ -170,10 +174,9 @@ def fmt_cmd(args, out):
 
 def bench_cmd(args, out):
     """Run benchmarks against an online chatmail instance."""
-    args = ["pytest", "--pyargs", "cmdeploy.tests.online.benchmark", "-vrx"]
-    cmdstring = " ".join(args)
-    out.green(f"[$ {cmdstring}]")
-    subprocess.check_call(args)
+    pytest_path = shutil.which("pytest")
+    benchmark = "tests/online/benchmark.py"
+    subprocess.check_call([pytest_path, benchmark, "-vrx"])
 
 
 def webdev_cmd(args, out):

deploy-chatmail/src/deploy_chatmail/deploy.py

@@ -1,6 +1,6 @@
 import os
 import pyinfra
-from cmdeploy import deploy_chatmail
+from deploy_chatmail import deploy_chatmail
 
 
 def main():

deploy-chatmail/src/deploy_chatmail/postfix/main.cf.j2

@@ -1,4 +1,4 @@
-myorigin = {{ config.mail_domain }}
+myorigin = {{ config.mailname }}
 
 smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
 biff = no
@@ -16,8 +16,8 @@ readme_directory = no
 compatibility_level = 2
 
 # TLS parameters
-smtpd_tls_cert_file=/var/lib/acme/live/{{ config.mail_domain }}/fullchain
-smtpd_tls_key_file=/var/lib/acme/live/{{ config.mail_domain }}/privkey
+smtpd_tls_cert_file=/var/lib/acme/live/{{ config.mailname }}/fullchain
+smtpd_tls_key_file=/var/lib/acme/live/{{ config.mailname }}/privkey
 smtpd_tls_security_level=may
 
 smtp_tls_CApath=/etc/ssl/certs
@@ -26,7 +26,7 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 smtp_tls_policy_maps = socketmap:inet:127.0.0.1:8461:postfix
 
 smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
-myhostname = {{ config.mail_domain }}
+myhostname = {{ config.mailname }}
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
 
@@ -45,7 +45,7 @@ inet_interfaces = all
 inet_protocols = all
 
 virtual_transport = lmtp:unix:private/dovecot-lmtp
-virtual_mailbox_domains = {{ config.mail_domain }}
+virtual_mailbox_domains = {{ config.mailname }}
 
 smtpd_milters = unix:opendkim/opendkim.sock
 non_smtpd_milters = $smtpd_milters

deploy-chatmail/src/deploy_chatmail/www.py

@@ -37,7 +37,7 @@ def build_webpages(src_dir, build_dir, config):
 
 
 def _build_webpages(src_dir, build_dir, config):
-    mail_domain = config.mail_domain
+    mail_domain = config.mailname
     assert src_dir.exists(), src_dir
     if not build_dir.exists():
         build_dir.mkdir()
@@ -71,7 +71,7 @@ def main():
     inipath = reporoot.joinpath("chatmail.ini")
     config = read_config(inipath)
     config.webdev = True
-    assert config.mail_domain
+    assert config.mailname
     www_path = reporoot.joinpath("www")
     src_path = www_path.joinpath("src")
     stats = None

scripts/initenv.sh

@@ -2,8 +2,8 @@
 set -e
 python3 -m venv venv
 
+venv/bin/pip install -e deploy-chatmail 
 venv/bin/pip install -e chatmaild 
-venv/bin/pip install -e cmdeploy
 
 source venv/bin/activate
 echo activated 'venv' python virtualenv environment containing "cmdeploy" tool

tests/conftest.py

@@ -38,7 +38,7 @@ def pytest_runtest_setup(item):
 
 @pytest.fixture
 def chatmail_config(pytestconfig):
-    current = basedir = Path().resolve()
+    current = basedir = Path()
     while 1:
         path = current.joinpath("chatmail.ini").resolve()
         if path.exists():
@@ -52,7 +52,7 @@ def chatmail_config(pytestconfig):
 
 @pytest.fixture
 def maildomain(chatmail_config):
-    return chatmail_config.mail_domain
+    return chatmail_config.mailname
 
 
 @pytest.fixture

tests/online/test_0_qr.py

@@ -1,4 +1,4 @@
-from cmdeploy.genqr import gen_qr_png_data
+from deploy_chatmail.genqr import gen_qr_png_data
 
 
 def test_gen_qr_png_data(maildomain):

tests/online/test_2_deltachat.py

@@ -91,9 +91,9 @@ class TestEndToEndDeltaChat:
 
         lp.sec("setup encrypted comms between ac1 and ac2 on different instances")
         qr = ac1.get_setup_contact_qr()
-        ch = ac2.qr_setup_contact(qr)
-        assert ch.id >= 10
-        ac1._evtracker.wait_securejoin_inviter_progress(1000)
+        ac2.qr_setup_contact(qr)
+        msg = ac2.wait_next_incoming_message()
+        assert "verified" in msg.text
 
         lp.sec("ac1 sends a message and ac2 marks it as seen")
         chat = ac1.create_chat(ac2)

tests/test_cmdeploy.py

@@ -1,7 +1,7 @@
 import os
 
 import pytest
-from cmdeploy.cmdeploy import get_parser, main
+from deploy_chatmail.cmdeploy import get_parser, main
 from chatmaild.config import read_config
 
 
@@ -25,7 +25,7 @@ class TestCmdline:
         main(["init", "chat.example.org"])
         inipath = tmp_path.joinpath("chatmail.ini")
         config = read_config(inipath)
-        assert config.mail_domain == "chat.example.org"
+        assert config.mailname == "chat.example.org"
 
     def test_init_not_overwrite(self):
         main(["init", "chat.example.org"])

tests/test_helpers.py

@@ -1,10 +1,10 @@
 import importlib.resources
 
-from cmdeploy.www import build_webpages
+from deploy_chatmail.www import build_webpages
 
 
 def test_build_webpages(tmp_path, make_config):
-    pkgroot = importlib.resources.files("cmdeploy")
+    pkgroot = importlib.resources.files("deploy_chatmail")
     src_dir = pkgroot.joinpath("../../../www/src").resolve()
     assert src_dir.exists(), src_dir
     config = make_config("chat.example.org")