fix gitea role

site.yml

@@ -51,6 +51,7 @@
     - { 
         role: testserver/docker_gitea, tags: gitea,
         servicename: "gitea",
+        basedir: "/srv/{{ servicename }}",
         domain: "verwaltung-git.test-warpzone.de"
       }
 

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
   

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 }}"