From 14ef3df33b6cebc012cecd4b31d9b570e1aae9d3 Mon Sep 17 00:00:00 2001
From: jabertwo <git@jabertwo.de>
Date: Sat, 23 Mar 2024 23:47:29 +0100
Subject: [PATCH] fix gitea role
---
site.yml | 1 +
testserver/docker_gitea/tasks/main.yml | 14 ++++++++------
.../docker_gitea/templates/docker-compose.yml | 8 ++++----
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/site.yml b/site.yml
index 454e020a..3d610f1b 100644
--- a/site.yml
+++ b/site.yml
@@ -51,6 +51,7 @@
- {
role: testserver/docker_gitea, tags: gitea,
servicename: "gitea",
+ basedir: "/srv/{{ servicename }}",
domain: "verwaltung-git.test-warpzone.de"
}
diff --git a/testserver/docker_gitea/tasks/main.yml b/testserver/docker_gitea/tasks/main.yml
index 780d0919..236f1dc6 100644
--- a/testserver/docker_gitea/tasks/main.yml
+++ b/testserver/docker_gitea/tasks/main.yml
@@ -2,8 +2,9 @@
# Get secrets
- include_tasks: ../functions/get_secret.yml
with_items:
- - { path: /srv/gitea/mysql_root_pw, length: 24 }
- - { path: /srv/gitea/mysql_user_pw, length: 12 }
+ - { path: "{{ basedir }}/secrets/mysql_root_pw", length: 24 }
+ - { path: "{{ basedir }}/secrets/mysql_user_pw", length: 12 }
+ - { path: "{{ basedir }}/secrets/gitea_admin_pass", length: 12 }
- name: create folder struct for gitea
file:
@@ -12,18 +13,19 @@
owner: 1000
group: 1000
with_items:
- - "/srv/gitea/db/"
- - "/srv/gitea/data/"
+ - "{{ basedir }}/db/"
+ - "{{ basedir }}/data/"
+ - "{{ basedir }}/secrets"
- name: Konfig-Dateien erstellen
template:
src: "{{item}}"
- dest: "/srv/gitea/{{item}}"
+ dest: "{{ basedir }}/{{item}}"
with_items:
- "docker-compose.yml"
- name: start gitea docker
community.docker.docker_compose_v2:
- project_src: /srv/gitea/
+ project_src: "{{ basedir }}"
state: present
diff --git a/testserver/docker_gitea/templates/docker-compose.yml b/testserver/docker_gitea/templates/docker-compose.yml
index 265a4bea..14264f92 100644
--- a/testserver/docker_gitea/templates/docker-compose.yml
+++ b/testserver/docker_gitea/templates/docker-compose.yml
@@ -11,13 +11,13 @@ services:
ports:
- 444:444
volumes:
- - /srv/gitea/data:/data
+ - {{ basedir }}/data:/data
environment:
APP_NAME: "Warpzone Verwaltung"
RUN_MODE: "prod"
- SSH_DOMAIN: "verwaltung-git.warpzone.ms"
+ SSH_DOMAIN: "{{ domain }}"
SSH_PORT: "444"
- ROOT_URL: "https://verwaltung-git.warpzone.ms"
+ ROOT_URL: "https://{{ domain }}"
HTTP_PORT: "42001"
USER_UID: "1000"
USER_GID: "1000"
@@ -46,7 +46,7 @@ services:
image: mariadb:11
restart: always
volumes:
- - /srv/gitea/db/:/var/lib/mysql
+ - {{ basedir }}/db/:/var/lib/mysql
environment:
MYSQL_ROOT_PASSWORD: "{{ mysql_root_pw }}"
MYSQL_PASSWORD: "{{ mysql_user_pw }}"
--
GitLab