cqrenet/relay
4
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-19 20:38:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: chatmaild build + deployment

Browse Source
This commit is contained in:
missytake
2023-10-15 20:01:43 +02:00
parent ade18aab7b
commit df6ec4bd6d
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
deploy-chatmail/src/deploy_chatmail/__init__.py
View File

@@ -25,7 +25,7 @@ def _install_chatmaild() -> None:
apt.packages( apt.packages(
name="apt install python3-aiosmtpd", name="apt install python3-aiosmtpd",
packages="python3-aiosmtpd", packages=["python3-aiosmtpd", "python3-pip"],
) )
# --no-deps because aiosmtplib is installed with `apt`. # --no-deps because aiosmtplib is installed with `apt`.
@@ -35,6 +35,7 @@ def _install_chatmaild() -> None:
) )
files.put( files.put(
name="upload doveauth-dictproxy.service",
src=importlib.resources.files("chatmaild") src=importlib.resources.files("chatmaild")
.joinpath("doveauth-dictproxy.service") .joinpath("doveauth-dictproxy.service")
.open("rb"), .open("rb"),
@@ -52,12 +53,8 @@ def _install_chatmaild() -> None:
daemon_reload=True, daemon_reload=True,
) )
server.shell(
name="install local doveauth build with pip",
commands=[f"pip install --break-system-packages --no-deps {remote_path}"],
)
files.put( files.put(
name="upload filtermail.service",
src=importlib.resources.files("chatmaild") src=importlib.resources.files("chatmaild")
.joinpath("filtermail.service") .joinpath("filtermail.service")
.open("rb"), .open("rb"),
@@ -207,10 +204,6 @@ def deploy_chatmail(mail_domain: str, mail_server: str, dkim_selector: str) -> N
], ],
) )
apt.packages(
name="apt install python3-pip",
packages="python3-pip",
)
_install_chatmaild() _install_chatmaild()
dovecot_need_restart = _configure_dovecot(mail_server) dovecot_need_restart = _configure_dovecot(mail_server)
postfix_need_restart = _configure_postfix(mail_domain) postfix_need_restart = _configure_postfix(mail_domain)

1
scripts/init.sh
View File

@@ -14,3 +14,4 @@ online-tests/venv/bin/pip install pytest pytest-timeout pdbpp deltachat
python3 -m venv venv python3 -m venv venv
venv/bin/pip install build venv/bin/pip install build
venv/bin/pip install 'setuptools>=68'

2
scripts/remote-deploy.sh
View File

@@ -5,4 +5,4 @@ set -e
: ${CHATMAIL_SSH_HOST:=$CHATMAIL_DOMAIN} : ${CHATMAIL_SSH_HOST:=$CHATMAIL_DOMAIN}
rsync -avz . "root@$CHATMAIL_SSH_HOST:/root/chatmail" --exclude='/.git' --filter="dir-merge,- .gitignore" rsync -avz . "root@$CHATMAIL_SSH_HOST:/root/chatmail" --exclude='/.git' --filter="dir-merge,- .gitignore"
ssh "root@$CHATMAIL_SSH_HOST" "cd /root/chatmail; apt install -y python3-venv; python3 -m venv venv; venv/bin/pip install pyinfra build; venv/bin/python3 -m build -n --sdist doveauth --outdir dist; venv/bin/python3 -m build -n --sdist filtermail --outdir dist; venv/bin/pip install -e ./deploy-chatmail -e ./doveauth; export CHATMAIL_DOMAIN=$CHATMAIL_DOMAIN; venv/bin/pyinfra @local deploy.py" ssh "root@$CHATMAIL_SSH_HOST" "cd /root/chatmail; apt install -y python3-venv; python3 -m venv venv; venv/bin/pip install pyinfra build; venv/bin/python3 -m build -n --sdist chatmaild --outdir dist; venv/bin/pip install -e ./deploy-chatmail -e ./chatmaild; export CHATMAIL_DOMAIN=$CHATMAIL_DOMAIN; venv/bin/pyinfra @local deploy.py"