From b1a532b9633a3439d7d2523906db7f1dcc2e8369 Mon Sep 17 00:00:00 2001 From: hwalker928 Date: Mon, 18 Nov 2024 21:14:49 +0000 Subject: [PATCH] remove config --- config.json.example | 12 ------------ docker-compose.yml | 6 +++--- main.py | 5 ++++- 3 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 config.json.example diff --git a/config.json.example b/config.json.example deleted file mode 100644 index 7c3b55d..0000000 --- a/config.json.example +++ /dev/null @@ -1,12 +0,0 @@ -{ - "port": 5000, - "names": [ - "alice", - "bob", - "charlie" - ], - "year": "2024", - "budget": "10", - "reroll_enabled": true, - "admin_user": "Harry" -} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 78ba5e8..98e645b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,9 +2,11 @@ services: web: image: ghcr.io/hwalker928/secretsanta:latest environment: - REROLL_ENABLED: true ADMIN_USER: Harry VALID_NAMES: alice,ben,charlie,david + BUDGET: 10 + + REROLL_ENABLED: true MYSQL_DATABASE: secretsanta MYSQL_USER: santa @@ -12,8 +14,6 @@ services: MYSQL_HOST: db depends_on: - db - volumes: - - ./config.json:/usr/src/app/config.json ports: - "5000:5000" restart: on-failure diff --git a/main.py b/main.py index b970ed6..5c59e65 100644 --- a/main.py +++ b/main.py @@ -1,8 +1,9 @@ -from flask import Flask, render_template, redirect, request, jsonify +from flask import Flask, render_template, redirect, jsonify import mysql.connector import random import logging import os +import datetime # Configure logging logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s") @@ -13,6 +14,8 @@ "reroll_enabled": os.getenv("REROLL_ENABLED", "true").lower() == "true", "admin_user": os.getenv("ADMIN_USER", "admin"), "names": os.getenv("VALID_NAMES", "").split(","), + "year": os.getenv("YEAR", datetime.datetime.now().year), + "budget": os.getenv("BUDGET", "10") } app = Flask(__name__)