From b563f6b878ee75675e2ed4abfa15378dd07162d9 Mon Sep 17 00:00:00 2001
From: Paweł Dybiec <pawel.to.malpa@gmail.com>
Date: Thu, 18 Apr 2019 10:47:19 +0200
Subject: Move passwords to vault

---
 docker.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'docker.yml')

diff --git a/docker.yml b/docker.yml
index 113199d..d243a95 100644
--- a/docker.yml
+++ b/docker.yml
@@ -6,6 +6,7 @@
     docker_compose_dir: "~/compose"
   vars_files:
   - domains.yml
+  - secrets.yml
   tasks:
   - name: Remove old config
     file:
@@ -80,7 +81,7 @@
               - DB_HOST=db:5432
               - DB_NAME=gitea
               - DB_USER=gitea
-              - DB_PASSW=gitea
+              - "DB_PASSW={{gitea_db_password}}"
               - "ROOT_URL=https://{{domains.git.name}}"
               - SSH_DOMAIN=git.dybiec.info
               - SSH_PORT=2022
@@ -98,7 +99,7 @@
             restart: always
             environment:
               - POSTGRES_USER=gitea
-              - POSTGRES_PASSWORD=gitea
+              - "POSTGRES_PASSWORD={{gitea_db_password}}"
               - POSTGRES_DB=gitea
             networks:
               - gitea
@@ -121,7 +122,7 @@
             - "127.0.0.1:{{domains.grafana.proxy.port}}:3000"
             environment:
             - "GF_SERVER_ROOT_URL=http://{{domains.grafana.name}}"
-            - GF_SECURITY_ADMIN_PASSWORD=very_secret
+            - "GF_SECURITY_ADMIN_PASSWORD={{grafana_admin_password}}"
             volumes:
             - "grafana-storage:/var/lib/grafana"
             restart: always
-- 
cgit 1.4.1