Restructure and cleaned up in preparation of new backup logic

roles/web-app-gitea/config/main.yml

@@ -1,6 +1,4 @@
-title:                            "CyMaIS Code Hub"
-images:
-  gitea:                          "gitea/gitea:latest"
+title:                            "CyMaIS Code Hub" # @todo load automatic based on service_porvider infos
 configuration:
   repository:
     enable_push_create_user:      True      # Allow users to push local repositories to Gitea and have them automatically created for a user.
@@ -9,14 +7,14 @@ configuration:
 features:
   matomo:                         true
   css:                            false
-  port-ui-desktop:               true
+  port-ui-desktop:                true
   central_database:               true
   ldap:                           true
   oauth2:                         true
-  oidc:                           false # Deactivated because users aren't auto-created. 
+  oidc:                           false     # Deactivated because users aren't auto-created. 
 oauth2_proxy:
   application:                    "application"
-  port:                           "3000"
+  port:                           "<< defaults_applications[web-app-gitea].docker.services.gitea.port >>"
   acl:
     blacklist:
       - "/user/login"
@@ -40,4 +38,12 @@ domains:
 docker:
   services:
     database:
-      enabled: true
+      enabled: true
+    gitea:                          
+      image:            "gitea/gitea"
+      version:          "latest"
+      no_stop_required: true
+      port:             3000
+      name:             "gitea"
+  volumes:
+    data:             "gitea_data"

roles/web-app-gitea/templates/docker-compose.yml.j2

@@ -2,7 +2,8 @@
 
   application:
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-    image: "{{ applications | get_app_conf(application_id, 'images.gitea', True) }}"
+    image: "{{ gitea_image }}:{{ gitea_version }}"
+    name:  "{{ gitea_name }}"
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
       - "{{ports.public.ssh[application_id]}}:22"
@@ -16,5 +17,6 @@
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   data:
+    name: {{ gitea_volume }}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}

roles/web-app-gitea/vars/main.yml

@@ -1,6 +1,5 @@
-application_id:     "gitea"
-container_port:   3000
-database_type:      "mariadb"
+application_id:       "web-app-gitea"
+database_type:        "mariadb"
 gitea_ldap_auth_args:
   - '--name "LDAP ({{ primary_domain }})"'
   - '--host "{{ ldap.server.domain }}"'
@@ -16,3 +15,9 @@ gitea_ldap_auth_args:
   - '--email-attribute "{{ ldap.user.attributes.mail }}"'
   - '--public-ssh-key-attribute "{{ ldap.user.attributes.ssh_public_key }}"'
   - '--synchronize-users'
+gitea_version:   "{{ applications | get_app_conf(application_id, 'docker.services.gitea.version', True) }}"
+gitea_image:     "{{ applications | get_app_conf(application_id, 'docker.services.gitea.image', True) }}"
+gitea_name:      "{{ applications | get_app_conf(application_id, 'docker.services.gitea.name', True) }}"
+gitea_volume:    "{{ applications | get_app_conf(application_id, 'docker.volumes.data', True) }}"
+
+container_port:  "{{ applications | get_app_conf(application_id, 'docker.services.gitea.port', True) }}"