diff --git a/Containerfile b/Containerfile index 4ac1b83..f44420d 100644 --- a/Containerfile +++ b/Containerfile @@ -1,10 +1,6 @@ FROM alpine:latest WORKDIR /opt/ -ENV GIT_URL=https://git.adrianux.net -ENV WEBSITE_URL=https://adrianux.net -ENV DEBUG_MODE=False - RUN apk add --no-cache git python3 RUN git clone https://git.adrianux.net/ahoemann/Adrianux.net.git /opt RUN python3 -m venv /opt/.venv @@ -13,4 +9,4 @@ RUN apk del git EXPOSE 8080 -CMD [ "/opt/.venv/bin/waitress-serve", "--listen=0.0.0.0:8080", "app:app" ] +CMD [ "/opt/.venv/bin/waitress-serve", "--listen=0.0.0.0:8080", "app:app" ] \ No newline at end of file diff --git a/adrianux.toml b/adrianux.toml new file mode 100644 index 0000000..0dc3ed8 --- /dev/null +++ b/adrianux.toml @@ -0,0 +1,5 @@ +[site] +git_url=https://git.adrianux.net +website_url=https://adrianux.net +[mode] +debug_mode=False diff --git a/app.py b/app.py index 29999af..10e479d 100755 --- a/app.py +++ b/app.py @@ -1,7 +1,8 @@ #!/usr/bin/env python3 from flask import Flask, render_template, redirect, url_for import requests -import os +import configparser + app = Flask(__name__) @@ -19,8 +20,8 @@ def homepage(): @app.route("/monitoring") def monitoring(): - git_url = os.environ['GIT_URL'] - website_url = os.environ['WEBSITE_URL'] + git_url = parser("site", "git_url") + website_url = parser("site", "website_url") return render_template("monitoring.html", git_status = get_status(git_url), website_status = get_status(website_url) ) def get_status_code(link): @@ -37,6 +38,11 @@ def get_status(link): except: return "OFFLINE" +def parser(section, attribute): + config = configparser.RawConfigParser() + config.read("./adrianux.toml") + return config.get(section, attribute) + if __name__ == "__main__": - mode = os.environ['DEBUG_MODE'] + mode = parser("mode","debug_mode") app.run(debug=mode)