From 1eaa22b330495c66ef2aa85300a8281429a2d958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Dachary?= Date: Tue, 28 Jun 2022 10:42:19 +0200 Subject: [PATCH] gitea runs on port 22, ssh on port 2222 --- .../templates/infrastructure/yml/service.yml | 4 ++++ infrastructure/utils.py | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 infrastructure/templates/infrastructure/yml/service.yml diff --git a/infrastructure/templates/infrastructure/yml/service.yml b/infrastructure/templates/infrastructure/yml/service.yml new file mode 100644 index 0000000..27c35ce --- /dev/null +++ b/infrastructure/templates/infrastructure/yml/service.yml @@ -0,0 +1,4 @@ +gitea-service-group: + hosts: + {{ subdomain }}-host: + ansible_port: 2222 diff --git a/infrastructure/utils.py b/infrastructure/utils.py index febed6e..70d378f 100644 --- a/infrastructure/utils.py +++ b/infrastructure/utils.py @@ -90,6 +90,13 @@ class Infra: return self.repo_path.joinpath(f"inventory/{subdomain}-backup.yml") + def _service_path(self, subdomain: str) -> Path: + """ + utility method: get service file for a subdomain + """ + + return self.repo_path.joinpath(f"inventory/{subdomain}-service.yml") + def _hostscript_path(self, subdomain: str) -> Path: """ utility method: hostscript file for a subdomain @@ -114,6 +121,7 @@ class Infra: """ self.repo.git.add(str(self._host_vars_dir(subdomain=subdomain))) self.repo.git.add(str(self._backup_path(subdomain=subdomain))) + self.repo.git.add(str(self._service_path(subdomain=subdomain))) self.repo.git.add(str(self._hostscript_path(subdomain=subdomain))) def _commit(self, action: str, subdomain: str): @@ -204,6 +212,14 @@ class Infra: ) ) + service = self._service_path(subdomain) + with open(backup, "w", encoding="utf-8") as f: + f.write( + render_to_string( + "infrastructure/yml/service.yml", context={"subdomain": subdomain} + ) + ) + # hostscript = self.repo_path.join("inventory/hosts-scripts/{instance.name}-host.sh") self.write_hostscript( @@ -231,6 +247,9 @@ class Infra: backup = self._backup_path(subdomain) os.remove(backup) + service = self._service_path(subdomain) + os.remove(service) + self.write_hostscript( subdomain=subdomain, content=render_to_string(