Renamed multiple roles incl. gitlab to to web-app-*

roles/update-apt/vars/main.yml

@@ -1 +1 @@
-application_id: apt
+application_id: update-apt

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

@@ -1,4 +1,4 @@
 ---
-application_id:             "attendize"
+application_id:             "web-app-attendize"
 database_type:              "mariadb"
 docker_repository_address:  "https://github.com/Attendize/Attendize.git"

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

@@ -1 +1 @@
-application_id: chess
+application_id: web-app-chess

roles/web-app-collabora/tasks/main.yml

@@ -13,6 +13,6 @@
     name: svc-db-mariadb
     state: present
     ipam_config:
-      - subnet: "{{ networks.local.collabora.subnet }}"
+      - subnet: "{{ networks.local[application_id].subnet }}"
   when: run_once_docker_mariadb is not defined
 

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

@@ -1,2 +1,2 @@
 ---
-application_id: collabora
+application_id: web-app-collabora

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

@@ -1,5 +1,3 @@
-images:
-  gitlab:             "gitlab/gitlab-ee:latest"
 features:
   matomo:             true
   css:                true
@@ -11,5 +9,8 @@ docker:
       enabled: true
     database: 
       enabled: true
+    gitlab: 
+      image:    "gitlab/gitlab-ee"
+      version:  "latest"
 credentials:
   initial_root_password: "{{ users.administrator.password }}"

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

@@ -1,7 +1,7 @@
 {% include 'roles/docker-compose/templates/base.yml.j2' %}
 
   web:
-    image: "{{ applications | get_app_conf(application_id, 'images.gitlab', True) }}"
+    image: "{{ gitlab_image }}:{{ gitlab_version }}"
     hostname: '{{domains | get_domain(application_id)}}'
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     ports:

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

@@ -1,3 +1,5 @@
-application_id:               "gitlab"
+application_id:               "web-app-gitlab"
 database_type:                "postgres"
-gitlab_initial_root_password: "{{ applications | get_app_conf(application_id, 'credentials.initial_root_password') }}"
+gitlab_initial_root_password: "{{ applications | get_app_conf(application_id, 'credentials.initial_root_password') }}"
+gitlab_version:               "{{ applications | get_app_conf(application_id, 'docker.services.gitlab.version', True) }}"
+gitlab_image:                 "{{ applications | get_app_conf(application_id, 'docker.services.gitlab.image', True) }}"

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

@@ -1,2 +1,2 @@
-application_id: libretranslate # ID of the application
+application_id: web-app-libretranslate # ID of the application
 database_type:  0                    # Database type [postgres, mariadb]

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

@@ -162,7 +162,7 @@ plugins:
     enabled: false
   integration_gitlab:
     # Nextcloud Integration GitLab: connects Nextcloud with GitLab repositories (https://apps.nextcloud.com/apps/integration_gitlab)
-    enabled: "{{ 'gitlab' in group_names | lower }}"
+    enabled: "{{ 'web-app-gitlab' in group_names | lower }}"
   integration_github:
     # Nextcloud Integration GitHub: integrates GitHub repositories with Nextcloud (https://apps.nextcloud.com/apps/integration_github)
     enabled: false

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

@@ -1 +1 @@
-application_id: postmarks
+application_id: web-app-postmarks

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

@@ -1,2 +1,2 @@
-application_id: pretix # ID of the application
+application_id: web-app-pretix # ID of the application
 database_type:  0                    # Database type [postgres, mariadb]