Restructure and cleaned up in preparation of new backup logic

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

@@ -1,4 +1,3 @@
-version:              "13"    # Update when available. Sadly no rolling release implemented
 oauth2_proxy:  
   application:        "proxy"
   port:               "80"
@@ -31,4 +30,20 @@ domains:
 docker:
   services:
     database:
-      enabled: true
+      enabled: true
+    web:
+      name:     openproject-web
+      image:    openproject/community
+      version:  "13"    # Update when available. Sadly no rolling release implemented
+      no_stop_required: true
+    seeder:
+      name:     openproject-seeder
+    cron:
+      name:     openproject-cron
+    worker:
+      name:     openproject-worker
+    proxy:
+      name:     openproject-proxy
+    
+  volumes:
+    data: "openproject_data"

roles/web-app-openproject/templates/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM openproject/community:{{applications.openproject.version}}
+FROM {{ openproject_image }}:{{ openproject_version }}
 
 # If installing a local plugin (using `path:` in the `Gemfile.plugins` above),
 # you will have to copy the plugin code into the container here and use the

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

@@ -17,7 +17,7 @@ x-op-app: &app
   proxy:
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     image: {{custom_openproject_image}}
-    container_name: openproject-proxy
+    container_name: {{ openproject_proxy_name }}
     command: "./docker/prod/proxy"
     ports:
       - "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
@@ -33,7 +33,7 @@ x-op-app: &app
     <<: *app
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     command: "./docker/prod/web"
-    container_name: openproject-web
+    container_name: {{ openproject_web_name }}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on/dmbs_incl.yml.j2' %}
       cache:
@@ -51,7 +51,7 @@ x-op-app: &app
     <<: *app
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     command: "./docker/prod/worker"
-    container_name: openproject-worker
+    container_name: {{ openproject_worker_name }}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on/dmbs_incl.yml.j2' %}
       cache:
@@ -67,7 +67,7 @@ x-op-app: &app
     <<: *app
 {% include 'roles/docker-container/templates/base.yml.j2' %}
     command: "./docker/prod/cron"
-    container_name: openproject-cron
+    container_name: {{ openproject_cron_name }}
 {% include 'roles/docker-container/templates/networks.yml.j2' %}
 {% include 'roles/docker-container/templates/depends_on/dmbs_incl.yml.j2' %}
       cache:
@@ -81,7 +81,7 @@ x-op-app: &app
   seeder:
     <<: *app
     command: "./docker/prod/seeder"
-    container_name: openproject-seeder
+    container_name: {{ openproject_seeder_name }}
     env_file:
       - "{{docker_compose.files.env}}"
     logging:
@@ -94,5 +94,6 @@ x-op-app: &app
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   data:
+    name: {{ openproject_volume }}
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}

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

@@ -1,7 +1,15 @@
-application_id:               "openproject"
+application_id:               "web-app-openproject"
 docker_repository_address:    "https://github.com/opf/openproject-deploy"
 database_type:                "postgres"
 docker_repository:            true
+openproject_version:          "{{ applications | get_app_conf(application_id, 'docker.services.web.version', True) }}"
+openproject_image:            "{{ applications | get_app_conf(application_id, 'docker.services.web.image', True) }}"
+openproject_volume:           "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"
+openproject_web_name:         "{{ applications | get_app_conf(application_id, 'docker.services.web.name', True) }}"
+openproject_seeder_name:      "{{ applications | get_app_conf(application_id, 'docker.services.seeder.name', True) }}"
+openproject_cron_name:        "{{ applications | get_app_conf(application_id, 'docker.services.cron.name', True) }}"
+openproject_proxy_name:       "{{ applications | get_app_conf(application_id, 'docker.services.proxy.name', True) }}"
+openproject_worker_name:      "{{ applications | get_app_conf(application_id, 'docker.services.worker.name', True) }}"
       
 openproject_plugins_folder:  "{{docker_compose.directories.volumes}}plugins/"