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

group_vars/all/09_ports.yml

@@ -36,7 +36,7 @@ ports:
       web-app-funkwhale: 8012
       web-app-roulette-wheel: 8013
       web-app-joomla: 8014
-      attendize: 8015
+      web-app-attendize: 8015
       web-app-pgadmin: 8016
       web-app-baserow: 8017
       web-app-matomo: 8018
@@ -45,7 +45,7 @@ ports:
       web-app-matrix_synapse: 8021
       web-app-matrix_element: 8022
       web-app-openproject: 8023
-      gitlab: 8024
+      web-app-gitlab: 8024
       web-app-akaunting: 8025
       web-app-moodle: 8026
       web-app-taiga: 8027
@@ -63,18 +63,18 @@ ports:
       web-app-navigator: 8039
       web-app-espocrm: 8040
       syncope: 8041
-      collabora: 8042
+      web-app-collabora: 8042
       web-app-mobilizon: 8043
       web-svc-simpleicons: 8044
-      libretranslate: 8045
+      web-app-libretranslate: 8045
-      pretix: 8046
+      web-app-pretix: 8046
       web-app-mig: 8047
       web-app-bigbluebutton: 48087    # This port is predefined by bbb. @todo Try to change this to a 8XXX port
   public:
     # The following ports should be changed to 22 on the subdomain via stream mapping
     ssh:
       web-app-gitea: 2201
-      gitlab: 2202
+      web-app-gitlab: 2202
     ldaps:
       svc-db-openldap: 636
     stun:

group_vars/all/10_networks.yml

@@ -10,7 +10,7 @@ defaults_networks:
     # /28 Networks, 14 Usable Ip Addresses
     web-app-akaunting:
       subnet: 192.168.101.0/28
-    attendize:
+    web-app-attendize:
       subnet: 192.168.101.16/28
     web-app-baserow:
       subnet: 192.168.101.32/28
@@ -24,7 +24,7 @@ defaults_networks:
       subnet: 192.168.101.96/28
     web-app-gitea:
       subnet: 192.168.101.112/28
-    gitlab:
+    web-app-gitlab:
       subnet: 192.168.101.128/28
     web-app-joomla:
       subnet: 192.168.101.144/28
@@ -84,13 +84,13 @@ defaults_networks:
       subnet: 192.168.103.64/28
     syncope:
       subnet: 192.168.103.80/28
-    collabora:
+    web-app-collabora:
       subnet: 192.168.103.96/28
     web-svc-simpleicons:
       subnet: 192.168.103.112/28
-    libretranslate:
+    web-app-libretranslate:
       subnet: 192.168.103.128/28
-    pretix:
+    web-app-pretix:
       subnet: 192.168.103.144/28
     web-app-mig:
       subnet: 192.168.103.160/28

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]