Restructure and cleaned up in preparation of new backup logic

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}}