From 9e7adaf6a21b116dc018a932ef83a6d65c9f98d7 Mon Sep 17 00:00:00 2001 From: missytake Date: Sat, 4 Nov 2023 11:55:37 +0100 Subject: [PATCH] nginx: move config to own directory --- deploy-chatmail/src/deploy_chatmail/__init__.py | 4 ++-- .../src/deploy_chatmail/{ => nginx}/autoconfig.xml.j2 | 0 deploy-chatmail/src/deploy_chatmail/{ => nginx}/nginx.conf.j2 | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename deploy-chatmail/src/deploy_chatmail/{ => nginx}/autoconfig.xml.j2 (100%) rename deploy-chatmail/src/deploy_chatmail/{ => nginx}/nginx.conf.j2 (100%) diff --git a/deploy-chatmail/src/deploy_chatmail/__init__.py b/deploy-chatmail/src/deploy_chatmail/__init__.py index 62494a04..a9d11c4f 100644 --- a/deploy-chatmail/src/deploy_chatmail/__init__.py +++ b/deploy-chatmail/src/deploy_chatmail/__init__.py @@ -202,7 +202,7 @@ def _configure_nginx(domain: str, debug: bool = False) -> bool: need_restart = False main_config = files.template( - src=importlib.resources.files(__package__).joinpath("nginx.conf.j2"), + src=importlib.resources.files(__package__).joinpath("nginx/nginx.conf.j2"), dest="/etc/nginx/nginx.conf", user="root", group="root", @@ -212,7 +212,7 @@ def _configure_nginx(domain: str, debug: bool = False) -> bool: need_restart |= main_config.changed autoconfig = files.template( - src=importlib.resources.files(__package__).joinpath("autoconfig.xml.j2"), + src=importlib.resources.files(__package__).joinpath("nginx/autoconfig.xml.j2"), dest="/var/www/html/.well-known/autoconfig/mail/config-v1.1.xml", user="root", group="root", diff --git a/deploy-chatmail/src/deploy_chatmail/autoconfig.xml.j2 b/deploy-chatmail/src/deploy_chatmail/nginx/autoconfig.xml.j2 similarity index 100% rename from deploy-chatmail/src/deploy_chatmail/autoconfig.xml.j2 rename to deploy-chatmail/src/deploy_chatmail/nginx/autoconfig.xml.j2 diff --git a/deploy-chatmail/src/deploy_chatmail/nginx.conf.j2 b/deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2 similarity index 100% rename from deploy-chatmail/src/deploy_chatmail/nginx.conf.j2 rename to deploy-chatmail/src/deploy_chatmail/nginx/nginx.conf.j2