From 528ee92d66736328ed7ac54ce9387beb548189f6 Mon Sep 17 00:00:00 2001 From: Jonathan Styles Date: Tue, 21 Jan 2025 21:02:54 -0500 Subject: [PATCH] Fixed stuff --- app/util/settings.py | 2 ++ options-example.yml | 31 ++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/app/util/settings.py b/app/util/settings.py index 7775798..ae30b99 100644 --- a/app/util/settings.py +++ b/app/util/settings.py @@ -28,6 +28,8 @@ def BitwardenConfig(settings: dict): The bitwarden secrets are mapped to the settings dict using the bitwarden_mapping dict. The secrets are sourced based on a project id in the settings dict. """ + if settings["bws"]["enable"] == "false": + return settings logger.debug("Loading secrets from Bitwarden") try: project_id = settings["bws"]["project_id"] diff --git a/options-example.yml b/options-example.yml index 609c407..6b8269a 100644 --- a/options-example.yml +++ b/options-example.yml @@ -1,5 +1,5 @@ bws: - project_id: "your_project_id" + project_id: "your-project-id" enable: "false" jwt: @@ -16,15 +16,14 @@ infra: horizon: "https://horizon.hackucf.org" discord: - client_id: "your_discord_client_id_here" + client_id: "1" secret: "your_discord_secret_here" redirect_base: "https://join.hackucf.org/api/oauth/?redir=" scope: "email identify guilds.join" - bot_token: "your_discord_bot_token_here" - guild_id: "your_guild_id_here" - member_role: "your_member_role_id_here" + bot_token: "1" + guild_id: "1" + member_role: "1" enable: false - stripe: api_key: "your_stripe_api_key_here" webhook_secret: "your_stripe_webhook_secret_here" @@ -42,7 +41,21 @@ email: telemetry: url: "your_telemetry_url_here" enable: false - +keycloak: + username: "admin-test" + password: "test" + realm: "test" + url: https://example.com + enable: false + +google_wallet: + auth_json: > + { + "type": "service_account", + } + issuer_id: "1" + class_suffix: "hack_onboard_generic_v1" + enable: false database: - url: "sqlite:////data/database.db" # For docker create database/ - #url: "sqlite:///database/database.db" # For local dev create database/ \ No newline at end of file + #url: "sqlite:////data/database.db" # For docker create database/ + url: "sqlite:///database/database.db" # For local dev create database/