From 0e9fd9a14059321ba6ef02e595c348795077db80 Mon Sep 17 00:00:00 2001 From: Keith Stevens Date: Mon, 9 Jan 2023 14:56:13 +0900 Subject: [PATCH] Seeing the admin users, email from, and next auth secret secrets --- .github/workflows/release.yaml | 2 ++ ansible/dev.yaml | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index eec73daa..dea9c15d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -31,12 +31,14 @@ jobs: needs: [build-backend, build-web, build-bot] runs-on: ubuntu-latest env: + WEB_ADMIN_USERS: ${{ secrets.DEV_WEB_ADMIN_USERS }} WEB_DISCORD_CLIENT_ID: ${{ secrets.DEV_WEB_DISCORD_CLIENT_ID }} WEB_DISCORD_CLIENT_SECRET: ${{ secrets.DEV_WEB_DISCORD_CLIENT_SECRET }} WEB_EMAIL_SERVER_HOST: ${{ secrets.DEV_WEB_EMAIL_SERVER_HOST }} WEB_EMAIL_SERVER_PASSWORD: ${{ secrets.DEV_WEB_EMAIL_SERVER_PASSWORD }} WEB_EMAIL_SERVER_PORT: ${{ secrets.DEV_WEB_EMAIL_SERVER_PORT }} WEB_EMAIL_SERVER_USER: ${{ secrets.DEV_WEB_EMAIL_SERVER_USER }} + WEB_NEXTAUTH_SECRET: ${{ secrets.DEV_WEB_NEXTAUTH_SECRET }} steps: - name: Checkout uses: actions/checkout@v2 diff --git a/ansible/dev.yaml b/ansible/dev.yaml index cf0d70a4..48be673e 100644 --- a/ansible/dev.yaml +++ b/ansible/dev.yaml @@ -70,11 +70,14 @@ restart_policy: always network_mode: oasst env: + ADMIN_USERS: "{{ lookup('ansible.builtin.env', 'WEB_ADMIN_USERS') }}" + DATABASE_URL: postgres://postgres:postgres@oasst-postgres-web/postgres + DEBUG_LOGIN: "true" DISCORD_CLIENT_ID: "{{ lookup('ansible.builtin.env', 'WEB_DISCORD_CLIENT_ID') }}" DISCORD_CLIENT_SECRET: "{{ lookup('ansible.builtin.env', 'WEB_DISCORD_CLIENT_SECRET') }}" - EMAIL_SERVER_FROM: open-assistent@laion.ai + EMAIL_FROM: open-assistent@laion.ai EMAIL_SERVER_HOST: "{{ lookup('ansible.builtin.env', 'WEB_EMAIL_SERVER_HOST') }}" EMAIL_SERVER_PASSWORD: @@ -85,10 +88,9 @@ "{{ lookup('ansible.builtin.env', 'WEB_EMAIL_SERVER_USER') }}" FASTAPI_URL: http://oasst-backend:8080 FASTAPI_KEY: "1234" - DATABASE_URL: postgres://postgres:postgres@oasst-postgres-web/postgres - NEXTAUTH_SECRET: O/M2uIbGj+lDD2oyNa8ax4jEOJqCPJzO53UbWShmq98= + NEXTAUTH_SECRET: + "{{ lookup('ansible.builtin.env', 'WEB_NEXTAUTH_SECRET') }}" NEXTAUTH_URL: http://web.dev.open-assistant.io/ - DEBUG_LOGIN: "true" ports: - 3000:3000 command: bash wait-for-postgres.sh node server.js