From 5cc8cd3321b50fb2da8812308d9d727260a708d1 Mon Sep 17 00:00:00 2001 From: Vassiliy Yegorov Date: Thu, 25 Aug 2022 14:10:23 +0700 Subject: [PATCH] fix --- docs/vault-psql-dynamic.md | 4 ++-- psql/docker-compose.yaml | 22 ++-------------------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/docs/vault-psql-dynamic.md b/docs/vault-psql-dynamic.md index b117a9e..e635025 100644 --- a/docs/vault-psql-dynamic.md +++ b/docs/vault-psql-dynamic.md @@ -12,9 +12,9 @@ vault secrets enable -path=psql database vault write psql/config/test-psql \ plugin_name=postgresql-database-plugin \ allowed_roles="db1-role" \ - connection_url="postgresql://{{username}}:{{password}}@psql:5432/postgres?sslmode=disable" \ + connection_url="postgresql://{{username}}:{{password}}@psql:5432/testdb1?sslmode=disable" \ username="testuser" \ - password="passw0rd" + password="password" ``` 2. добавляем роль diff --git a/psql/docker-compose.yaml b/psql/docker-compose.yaml index fc03532..905fad6 100644 --- a/psql/docker-compose.yaml +++ b/psql/docker-compose.yaml @@ -6,7 +6,8 @@ services: restart: always environment: POSTGRES_USER: testuser - POSTGRES_PASSWORD: passw0rd + POSTGRES_PASSWORD: password + POSTGRES_DB: testdb1 volumes: - pgdata:/var/lib/postgresql/data expose: @@ -14,28 +15,9 @@ services: networks: - vault_net - adminer: - image: adminer - container_name: adminer - labels: - - "traefik.enable=true" - - "traefik.http.routers.testdb-adminer.rule=Host(`${VAULT_HOST}`) && Path(`/adminer`)" - - "traefik.http.routers.testdb-adminer.entrypoints=https" - - "traefik.http.routers.testdb-adminer.tls=true" - - "traefik.http.routers.testdb-adminer.tls.certresolver=letsEncrypt" - - "traefik.http.services.testdb-adminer-service.loadbalancer.server.port=8080" - - "traefik.docker.network=webproxy" - expose: - - 8080 - networks: - - vault_net - - webproxy - networks: vault_net: name: vault_net - webproxy: - name: webproxy volumes: pgdata: