Moved web-app-phpmyadmin to new structure

group_vars/all/09_ports.yml

@@ -9,7 +9,7 @@ ports:
       web-app-mastodon: 4001
       web-app-espocrm: 4002
     oauth2_proxy:
-      phpmyadmin: 4181
+      web-app-phpmyadmin: 4181
       lam: 4182
       web-app-openproject: 4183
       yourls: 4184
@@ -54,7 +54,7 @@ ports:
       bluesky_web: 8031
       web-app-keycloak: 8032
       lam: 8033
-      phpmyadmin: 8034
+      web-app-phpmyadmin: 8034
       snipe-it: 8035
       sphinx: 8036
       phpldapadmin: 8037

group_vars/all/10_networks.yml

@@ -56,7 +56,7 @@ defaults_networks:
       subnet: 192.168.102.80/28
     web-app-peertube:
       subnet: 192.168.102.96/28
-    phpmyadmin:
+    web-app-phpmyadmin:
       subnet: 192.168.102.112/28
     web-app-pixelfed:
       subnet: 192.168.102.128/28

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

@@ -1,4 +1,3 @@
-version:              "latest"      # Use the latest phpmyadmin version
 autologin:            false         # This is a high security risk. Just activate this option if you know what you're doing
 oauth2_proxy:  
   port:               "80"
@@ -6,7 +5,7 @@ oauth2_proxy:
 features:
   matomo:             true
   css:                false
-  port-ui-desktop:   false   # Opens itself in a new window, when it's loaded in an iframe.
+  port-ui-desktop:    false   # Opens itself in a new window, when it's loaded in an iframe.
                               # it's anyhow not so enduser relevant, so it can be kept like this
   central_database:   true
   oauth2:             true
@@ -24,3 +23,7 @@ docker:
   services:
     database:
       enabled: true
+    phpmyadmin:
+      version:  "latest"      # Use the latest phpmyadmin version
+      name:     "phpmyadmin"
+      image:    phpmyadmin/phpmyadmin

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

@@ -2,8 +2,8 @@
 
   application:
 {% set container_port = 80 %}
-    image: phpmyadmin/phpmyadmin:{{applications.phpmyadmin.version}}
-    container_name: phpmyadmin
+    image: "{{ phpmyadmin_image }}:{{ phpmyadmin_version }}"
+    container_name: "{{ phpmyadmin_name }}"
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"

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

@@ -1,3 +1,6 @@
-application_id:       "phpmyadmin"
+application_id:       "web-app-phpmyadmin"
 database_type:        "mariadb"
 database_host:        "{{ applications | get_app_conf('svc-db-mariadb', 'docker.services.mariadb.name', True) if applications | get_app_conf(application_id, 'features.central_database', False)}}"
+phpmyadmin_version:   "{{ applications | get_app_conf(application_id, 'docker.services.phpmyadmin.version', True) }}"
+phpmyadmin_image:     "{{ applications | get_app_conf(application_id, 'docker.services.phpmyadmin.image', True) }}"
+phpmyadmin_name:      "{{ applications | get_app_conf(application_id, 'docker.services.phpmyadmin.name', True) }}"