From 90b671e84196bb74c46b4d6e2dc0c42bfa2226ca Mon Sep 17 00:00:00 2001 From: Will Nilges Date: Thu, 16 Mar 2023 17:26:13 -0400 Subject: [PATCH 1/3] Add .env file and remove some unneeded vars --- .env | 10 ++++++++++ src/config.py | 6 ++---- 2 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..b834ca2 --- /dev/null +++ b/.env @@ -0,0 +1,10 @@ +SERVER_NAME= +OIDC_CLIENT_SECRET= +DEVCADE_API_URI= +# For the usersDB +POSTGRESQL_USER= +POSTGRESQL_PASSWORD= +POSTGRESQL_IP= +POSTGRESQL_DATABASE= +# You can also specify a URI if you wanna do that +SQLALCHEMY_DATABASE_URI= diff --git a/src/config.py b/src/config.py index 045b097..633b00f 100644 --- a/src/config.py +++ b/src/config.py @@ -12,6 +12,7 @@ SERVER_NAME = env.get('SERVER_NAME', 'localhost:5000') PREFERRED_URL_SCHEME = env.get('PREFERRED_URL_SCHEME', 'https') +# For the UsersDB POSTGRESQL_USER = env.get('POSTGRESQL_USER', '') POSTGRESQL_PASSWORD = env.get('POSTGRESQL_PASSWORD') POSTGRESQL_DATABASE = env.get('POSTGRESQL_DATABASE', 'usersDB') @@ -22,12 +23,9 @@ SQLALCHEMY_DATABASE_URI = 'sqlite:///users.sqlite3' SQLALCHEMY_TRACK_MODIFICATIONS = 'False' -AWS_ACCESS_KEY_ID = env.get('AWS_ACCESS_KEY_ID', '') -AWS_SECRET_ACCESS_KEY = env.get('AWS_SECRET_ACCESS_KEY', '') - # OpenID Connect SSO config CSH OIDC_ISSUER = env.get('OIDC_ISSUER', 'https://sso.csh.rit.edu/auth/realms/csh') OIDC_CLIENT_ID = env.get('OIDC_CLIENT_ID', 'devcade') OIDC_CLIENT_SECRET = env.get('OIDC_CLIENT_SECRET', 'NOT-A-SECRET') -DEVCADE_API_URI = env.get('DEVCADE_API_URI') \ No newline at end of file +DEVCADE_API_URI = env.get('DEVCADE_API_URI') From 2898a09f3871bc5d22fe84ea225379f640b187d6 Mon Sep 17 00:00:00 2001 From: Will Nilges Date: Thu, 16 Mar 2023 20:11:25 -0400 Subject: [PATCH 2/3] Add stuff for local dev environment --- .env.sample | 10 ++++++++++ .gitignore | 3 ++- HACKING/build-env.sh | 3 +++ HACKING/launch-env.sh | 5 +++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 .env.sample create mode 100755 HACKING/build-env.sh create mode 100755 HACKING/launch-env.sh diff --git a/.env.sample b/.env.sample new file mode 100644 index 0000000..b834ca2 --- /dev/null +++ b/.env.sample @@ -0,0 +1,10 @@ +SERVER_NAME= +OIDC_CLIENT_SECRET= +DEVCADE_API_URI= +# For the usersDB +POSTGRESQL_USER= +POSTGRESQL_PASSWORD= +POSTGRESQL_IP= +POSTGRESQL_DATABASE= +# You can also specify a URI if you wanna do that +SQLALCHEMY_DATABASE_URI= diff --git a/.gitignore b/.gitignore index fc1e5cf..a81819a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ __pycache__ envs.py +.env .venv venv/ users.sqlite3 -launch.json \ No newline at end of file +launch.json diff --git a/HACKING/build-env.sh b/HACKING/build-env.sh new file mode 100755 index 0000000..32aa588 --- /dev/null +++ b/HACKING/build-env.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +podman build --tag devcade-api-dev diff --git a/HACKING/launch-env.sh b/HACKING/launch-env.sh new file mode 100755 index 0000000..f5e2104 --- /dev/null +++ b/HACKING/launch-env.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +set -e + +podman run --rm -it --env-file .env -p 8080:8080 devcade-website-dev From ee789edd9024e60404ec07c04b4d5677dc1690b8 Mon Sep 17 00:00:00 2001 From: Willard Nilges Date: Thu, 16 Mar 2023 20:12:14 -0400 Subject: [PATCH 3/3] Delete .env --- .env | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index b834ca2..0000000 --- a/.env +++ /dev/null @@ -1,10 +0,0 @@ -SERVER_NAME= -OIDC_CLIENT_SECRET= -DEVCADE_API_URI= -# For the usersDB -POSTGRESQL_USER= -POSTGRESQL_PASSWORD= -POSTGRESQL_IP= -POSTGRESQL_DATABASE= -# You can also specify a URI if you wanna do that -SQLALCHEMY_DATABASE_URI=