From ed6cbc84955e0268aa7f75ab3cb1df3793060906 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Fri, 25 Sep 2020 12:18:15 +0200
Subject: [PATCH] Tidy compose.yml

---
 compose.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/compose.yml b/compose.yml
index 98b31ad..cc04a13 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,3 +1,4 @@
+---
 version: "3.8"
 
 services:
@@ -7,10 +8,10 @@ services:
     volumes:
       - mariadb:/var/lib/mysql
     environment:
-      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
-      - MYSQL_PASSWORD_FILE=/run/secrets/db_password
       - MYSQL_DATABASE=matomo
       - MYSQL_USER=matomo
+      - MYSQL_PASSWORD_FILE=/run/secrets/db_password
+      - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
     networks:
       - internal
     secrets:
@@ -19,7 +20,7 @@ services:
 
   matomo:
     image: matomo
-    depends_on: 
+    depends_on:
       - mariadb
     volumes:
       - "matomo_config:/var/www/html/config"
@@ -55,12 +56,12 @@ volumes:
   matomo_logs:
 
 secrets:
-  db_root_password:    
-    external: true 
+  db_password:
+    external: true
+    name: ${STACK_NAME}_db_password_${DB_PASSWORD_VERSION}
+  db_root_password:
+    external: true
     name: ${STACK_NAME}_db_root_password_${DB_ROOT_PASSWORD_VERSION}
-  db_password:    
-    external: true 
-    name: ${STACK_NAME}_db_password_${DB_ROOT_PASSWORD_VERSION}
 
 networks:
   proxy: