Skip to content

Commit

Permalink
Fixed stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
jontyms committed Jan 22, 2025
1 parent d3d1c1c commit 528ee92
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 9 deletions.
2 changes: 2 additions & 0 deletions app/util/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
31 changes: 22 additions & 9 deletions options-example.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
bws:
project_id: "your_project_id"
project_id: "your-project-id"
enable: "false"

jwt:
Expand All @@ -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"
Expand All @@ -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/
#url: "sqlite:////data/database.db" # For docker create database/
url: "sqlite:///database/database.db" # For local dev create database/

0 comments on commit 528ee92

Please sign in to comment.