From 680970215ccf25c3aa7c7a15a366071942ab0115 Mon Sep 17 00:00:00 2001
From: c0repwn3r <core@coredoes.dev>
Date: Fri, 21 Apr 2023 18:55:13 -0400
Subject: [PATCH] fix! fix! fix! fix! fix! fix! fix! fix! fix! infra overhaul

---
 ansible/deploy.yaml             | 4 ++--
 docker/config.jinja.toml        | 2 +-
 docker/docker-compose.jinja.yml | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ansible/deploy.yaml b/ansible/deploy.yaml
index f55130a3552ac74c35599c0dfd61e02a79fa08c2..2f28db895211c37ed008885d13c935fa1a3a5977 100644
--- a/ansible/deploy.yaml
+++ b/ansible/deploy.yaml
@@ -6,8 +6,6 @@
     jwt_signing_secret: "{{ lookup('community.general.random_string', base64=True, length=24) }}"
 
     # Database info
-    db_pass: "{{ lookup('community.general.random_string', base64=True, length=24) }}"
-    db_user: starkingdoms-bleeding
     db_name: starkingdoms-bleeding
 
     # What version of the docker container should be deployed?
@@ -40,10 +38,12 @@
       ansible.builtin.template:
         src: ../docker/config.jinja.toml
         dest: "{{ api_config_dir }}/config.toml"
+        force: no
     - name: Create docker-compose config file
       ansible.builtin.template:
         src: ../docker/docker-compose.jinja.yml
         dest: "{{ compose_dir }}/docker-compose.yml"
+        force: no
     - name: Start the server
       ansible.builtin.shell:
         cmd: docker-compose up -d
diff --git a/docker/config.jinja.toml b/docker/config.jinja.toml
index bbe3d18660f7ca8f842bb709ea2d8a50eee4726a..eb220c6ddf225c901d5e54a1d9e84a388ac5e039 100644
--- a/docker/config.jinja.toml
+++ b/docker/config.jinja.toml
@@ -13,7 +13,7 @@ public_key = "-----BEGIN PUBLIC KEY-----\nMIGeMA0GCSqGSIb3DQEBAQUAA4GMADCBiAKBgH
 issuer = "https://api.e3t.cc"
 
 [database]
-url = "postgres://{{ db_user }}:{{ db_pass }}@postgres/{{ db_name }}"
+url = "postgres://postgres@postgres/{{ db_name }}"
 
 [server]
 listen = "0.0.0.0:8080"
diff --git a/docker/docker-compose.jinja.yml b/docker/docker-compose.jinja.yml
index f5a00085deeeae7678d0fd9c8afff6a2ebb8d554..5a33347bf0d83b677584ab172bd2c517ba7ae577 100644
--- a/docker/docker-compose.jinja.yml
+++ b/docker/docker-compose.jinja.yml
@@ -27,8 +27,6 @@ services:
     # docker run --name basic-postgres --rm -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=4y7sV96vA9wv46VR -e PGDATA=/var/lib/postgresql/data/pgdata -v /tmp:/var/lib/postgresql/data -p 5432:5432 -it postgres:14.1-alpine
     image: postgres:14.1-alpine
     environment:
-      - POSTGRES_USER={{ db_user }}
-      - POSTGRES_PASSWORD={{ db_pass }}
       - POSTGRES_DB={{ db_name }}
       - PGDATA=/var/lib/postgresql/data/pgdata
     volumes: