Actually standardize vars files using yaml suffix

playbooks/configure-mgmt.yml

@@ -24,9 +24,9 @@
 - name: Configure local accounts
   hosts: all
   vars_files:
-    - vars/accounts.yml
-    - vars/secrets/passwords.yml
-    - vars/sshkeys.yml
+    - vars/accounts.yaml
+    - vars/secrets/passwords.yaml
+    - vars/sshkeys.yaml
   tasks:
     - name: Create omni group
       become: true

playbooks/provision-common.yml

@@ -5,7 +5,7 @@
 - name: Configure system settings
   hosts: all
   vars_files:
-    - vars/packages.yml
+    - vars/packages.yaml
   pre_tasks:
     - import_tasks: tasks/centos-8-kernelplus.yml
   tasks:

resources/docker-compose/nextcloud.yaml.j2

@@ -17,7 +17,7 @@ volumes:
     name: datastore{{ omni_compose_apps.nextcloud.datastore }}/database
     driver: glusterfs
   data:
-    name: datastore{{ omni_compose_apps.nextcloud.datastore }}/data
+    name: datastore/cloud
     driver: glusterfs
   config:
     name: datastore{{ omni_compose_apps.nextcloud.datastore }}/config
@@ -25,37 +25,6 @@ volumes:
 
 
 services:
-  server:
-    image: nextcloud:{{ omni_compose_apps.nextcloud.versions.server | default(omni_compose_apps.nextcloud.versions.default) }}
-    hostname: nextcloud-server
-    networks:
-      - nextcloud
-    ports:
-      - published: {{ omni_compose_apps.nextcloud.ports.8080 }}
-        target: 8080
-        protocol: tcp
-        mode: ingress
-    volumes:
-      - type: volume
-        source: data
-        target: /data
-        read_only: false
-      - type: volume
-        source: config
-        target: /var/www/html
-        read_only: false
-    environment:
-      NEXTCLOUD_DATA_DIR: /data
-      NEXTCLOUD_ADMIN_USER: admin
-      NEXTCLOUD_ADMIN_PASSWORD: {{ omni_compose_app_secrets.nextcloud.admin_password }}
-      MYSQL_DATABASE: nextcloud
-      MYSQL_USER: root
-      MYSQL_PASSWORD: {{ omni_compose_app_secrets.nextcloud.database_password }}
-      MYSQL_HOST: database
-      REDIS_HOST: cache
-    deploy:
-      replicas: 1
-
   database:
     image: mariadb:{{ omni_compose_apps.nextcloud.versions.database | default(omni_compose_apps.nextcloud.versions.default) }}
     hostname: nextcloud-database
@@ -79,3 +48,40 @@ services:
       - nextcloud
     deploy:
       replicas: 1
+
+  server:
+    image: nextcloud:{{ omni_compose_apps.nextcloud.versions.server | default(omni_compose_apps.nextcloud.versions.default) }}
+    hostname: nextcloud-server
+    networks:
+      - nextcloud
+    depends_on:
+      - database
+      - cache
+    ports:
+      - published: {{ omni_compose_apps.nextcloud.published.ports.80 }}
+        target: 80
+        protocol: tcp
+        mode: ingress
+    volumes:
+      - type: volume
+        source: data
+        target: /data
+        read_only: false
+      - type: volume
+        source: config
+        target: /var/www/html
+        read_only: false
+    environment:
+      NEXTCLOUD_DATA_DIR: /data/
+      NEXTCLOUD_ADMIN_USER: admin
+      NEXTCLOUD_ADMIN_PASSWORD: {{ omni_compose_app_secrets.nextcloud.admin_password }}
+      NEXTCLOUD_TRUSTED_DOMAINS: localhost {{ inventory_hostname }} {{ omni_compose_apps.nextcloud.published.host }}
+      MYSQL_DATABASE: nextcloud
+      MYSQL_USER: root
+      MYSQL_PASSWORD: {{ omni_compose_app_secrets.nextcloud.database_password }}
+      MYSQL_HOST: database
+      REDIS_HOST: cache
+      PHP_MEMORY_LIMIT: "4G"
+      PHP_UPLOAD_LIMIT: "4G"
+    deploy:
+      replicas: 1

vars/applications.yaml

@@ -118,7 +118,7 @@ omni_compose_apps:
     published:
       host: wsd.enp.one
       ports:
-        8080: 8082
+        80: 8082
     networks:
       main: 192.168.107.0/24
     versions: