~starkingdoms/starkingdoms

680970215ccf25c3aa7c7a15a366071942ab0115 — c0repwn3r 2 years ago 46f8a04
fix! fix! fix! fix! fix! fix! fix! fix! fix! infra overhaul
3 files changed, 3 insertions(+), 5 deletions(-)

M ansible/deploy.yaml
M docker/config.jinja.toml
M docker/docker-compose.jinja.yml
M ansible/deploy.yaml => ansible/deploy.yaml +2 -2
@@ 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

M docker/config.jinja.toml => docker/config.jinja.toml +1 -1
@@ 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"

M docker/docker-compose.jinja.yml => docker/docker-compose.jinja.yml +0 -2
@@ 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: