From 4de73e51dfde9a0a3c933a1231a87bbcc9c6bb63 Mon Sep 17 00:00:00 2001 From: Marius Alwan Meyer Date: Sat, 1 Apr 2023 14:43:53 +0200 Subject: [PATCH] =?UTF-8?q?Unabh=C3=A4ngigkeit=20von=20`system`=20Variable?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 ++++----- templates/environment.env.j2 | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4fa945f..07ed36c 100644 --- a/README.md +++ b/README.md @@ -21,18 +21,17 @@ Damit die Rolle funktioniert muss eine Reihe an Variablen für alle Hosts bereit | Variable | Beschreibung | Werte | |----------|--------------|-------| -| `system['hostname']` | Hostname des Systems | (String) | -| `system['domain']` | Domain des Systems | (String) | +| `gitea['hostname']` | Gitea Hostname | (String) | +| `gitea['domain']` | Gitea Domain | (String) | | `gitea['app_name']` | Titel für die Startseite | (String) | Im Inventory sieht das dann in etwa so aus: ```yaml -system: - hostname: gitea - domain: int.example.com gitea: app_name: Beispiel Gitea Server + hostname: gitea + domain: int.example.com ``` #### Optionale Variablen diff --git a/templates/environment.env.j2 b/templates/environment.env.j2 index f2d3f73..90f8197 100644 --- a/templates/environment.env.j2 +++ b/templates/environment.env.j2 @@ -9,8 +9,8 @@ USER_GID={{ git_user.group }} USER={{ git_user.name }} GITEA__APP_NAME={{ gitea_vars.app_name }} GITEA__RUN_USER={{ git_user.name }} -GITEA__server__ROOT_URL=https://{{ system.hostname }}.{{ system.domain }}/ -GITEA__server__Domain={{ system.hostname }}.{{ system.domain }} +GITEA__server__ROOT_URL=https://{{ gitea.hostname }}.{{ gitea.domain }}/ +GITEA__server__Domain={{ gitea.hostname }}.{{ gitea.domain }} GITEA__server__SSH_PORT=22