Restructure and cleaned up in preparation of new backup logic

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

@@ -1,12 +1,11 @@
-images:
-  akaunting:      "docker.io/akaunting/akaunting:latest"
-company_name:       "{{primary_domain}}"
-company_email:      "{{ users.administrator.email }}"
+company:
+  name:             "Akaunting on {{ primary_domain | upper }}" # @todo load automatic based on service_provider infos, this will fail
+  email:            "{{ users.administrator.email }}" # @todo load automatic based on service_provider infos, this will fail
 setup_admin_email:  "{{ users.administrator.email }}"
 features:
   matomo:           true
   css:              true
-  port-ui-desktop: true
+  port-ui-desktop:  true
   central_database: true
 domains:
   canonical:
@@ -15,5 +14,12 @@ docker:
   services:
     database:
       enabled: true
+    akaunting:
+      no_stop_required: true
+      image: docker.io/akaunting/akaunting 
+      version: latest
+      name: akaunting
+  volumes: 
+    data: akaunting_data
 credentials: {}
 

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

@@ -2,12 +2,12 @@
   application:
 
 {% include 'roles/docker-container/templates/base.yml.j2' %}
-
-    image: "{{ applications | get_app_conf(application_id, 'images.' ~ application_id, True) }}"
+    container_name: {{ akaunting_name }}
+    image: "{{ akaunting_image }}:{{ akaunting_version }}"
     build:
       context: .
     ports:
-      - 127.0.0.1:{{ports.localhost.http[application_id]}}:80
+      - 127.0.0.1:{{ ports.localhost.http[application_id] }}:80
     volumes:
       - data:/var/www/html
     environment:
@@ -17,5 +17,7 @@
 
 {% include 'roles/docker-compose/templates/volumes.yml.j2' %}
   data:
+    name: {{ akaunting_volume }}
+
 
 {% include 'roles/docker-compose/templates/networks.yml.j2' %}

roles/web-app-akaunting/templates/env.j2

@@ -14,8 +14,8 @@ DB_PASSWORD={{database_password}}
 DB_PREFIX=asd_
 
 # These define the first company to exist on this instance. They are only used during setup.
-COMPANY_NAME={{applications | get_app_conf(application_id, 'company_name', True)}}
-COMPANY_EMAIL={{applications | get_app_conf(application_id, 'company_email', True)}}
+COMPANY_NAME={{applications | get_app_conf(application_id, 'company.name', True)}}
+COMPANY_EMAIL={{applications | get_app_conf(application_id, 'company.email', True)}}
 
 # This will be the first administrative user created on setup.
 ADMIN_EMAIL={{applications.akaunting.setup_admin_email}}

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

@@ -1,4 +1,8 @@
-application_id:             "akaunting"
+application_id:             "web-app-akaunting"
 database_type:              "mariadb"
 database_password:          "applications | get_app_conf(application_id, 'credentials.database_password', True)"
 docker_repository_address:  "https://github.com/akaunting/docker.git"
+akaunting_version:          "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.version', True) }}"
+akaunting_image:            "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.image', True) }}"
+akaunting_name:             "{{ applications | get_app_conf(application_id, 'docker.services.akaunting.name', True) }}"
+akaunting_volume:           "{{ applications | get_app_conf(application_id, 'docker.services.volumes.data', True) }}"