feat: removed old depedencies

.dockerignore

@@ -0,0 +1,7 @@
+.forgejo
+*compose.yml
+Dockerfile
+.git*
+Jenkinsfile
+LICENSE
+README.md

.env.example

@@ -0,0 +1 @@
+DEBUG_MODE=False

.forgejo/workflows/update.yaml

@@ -1,7 +0,0 @@
-on: [push]
-jobs:
-  update:
-    runs-on: self-hosted
-    steps:
-      - run: sudo git -C /opt/Adrianux.net/ pull
-      - run: sudo systemctl restart adrianux

.gitignore

@@ -1,2 +1,4 @@
-.venv
+.venv*
+.env
 __pycache__
+*theia-workspace

Containerfile

@@ -1,16 +0,0 @@
-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
-RUN /opt/.venv/bin/pip install --no-cache-dir -r requirements.txt
-RUN apk del git
-
-EXPOSE 8080
-
-CMD [ "/opt/.venv/bin/waitress-serve", "--listen=0.0.0.0:8080", "app:app" ]

Dockerfile

@@ -0,0 +1,14 @@
+FROM alpine:latest
+WORKDIR /opt/
+
+ENV DEBUG_MODE=False
+
+COPY . .
+
+RUN apk add --no-cache python3 py3-flask py3-waitress
+
+EXPOSE 8080
+
+HEALTHCHECK --interval=5m CMD wget --delete-after http://localhost:8080
+
+CMD [ "waitress-serve", "--listen=0.0.0.0:8080", "app:app" ]

README.md

@@ -1,32 +1,62 @@
 # Installation
 
-
 ## Setting up the environment
 
 1. Create a virtual environment:
-```bash
+
+```sh
 python3 -m venv .venv
 ```
 
 2. Activate the virtual environment:
-```bash
+
+```sh
 . .venv/bin/activate
 ```
 
 3. Install dependencies:
-```bash
+
+```sh
 pip install requirements.txt
 ```
 
+4. Set the environment variables:
+
+```sh
+export DEBUGMODE=False
+```
+
+Or source the .env file:
+
+```sh
+cp .env.example .env # change the variables to suit your environment as needed
+```
+
+```sh
+. .env
+```
+
+5. Run the app:
+
+```sh
+waitress-serve --listen=0.0.0.0:8080 app:app
+```
+
+# Docker
+
 ## Building the container
 
+```sh
+docker build -t adrianux:latest . 
 ```
-# <runtime> build -t adrianux:<tag> .
-```
-
 
 ## Running the container
 
+```sh
+docker run adrianux:latest
 ```
-# <runtime> run adrianux:<tag>
+# Docker Compose
+
+```sh
+docker compose up adrianux
 ```

app.py

@@ -1,42 +1,22 @@
 #!/usr/bin/env python3
-from flask import Flask, render_template, redirect, url_for
+from flask import Flask, render_template, url_for
-import requests
 import os
 
+
 app = Flask(__name__)
 
 @app.route("/imprint")
 def root():
-    return render_template("imprint.html")
+    return render_template("imprint.j2")
 
 @app.route("/about")
 def about():
-    return render_template("about.html")
+    return render_template("about.j2")
 
 @app.route("/")
 def homepage():
-    return render_template("homepage.html")
+    return render_template("homepage.j2")
 
-@app.route("/monitoring")
-def monitoring():
-    git_url = os.environ['GIT_URL']
-    website_url = os.environ['WEBSITE_URL']
-    return render_template("monitoring.html", git_status = get_status(git_url), website_status = get_status(website_url) )
-
-def get_status_code(link):
-    requested_site = requests.get(link)
-    return requested_site.status_code
-
-def get_status(link):
-    try:
-        match get_status_code(link):
-            case 200:
-                return "ONLINE"
-            case _:
-                return "ERROR"
-    except:
-        return "OFFLINE"
 
 if __name__ == "__main__":
-    mode = os.environ['DEBUG_MODE']
+    app.run(debug=os.environ['DEBUG_MODE'])
-    app.run(debug=mode)

docker-compose.yml

@@ -0,0 +1,7 @@
+---
+services:
+  container_name: "adrianux"
+  image: "git.adrianux.net/ahoemann/adrianux.net:1.2.0"
+  env_file: .env
+  ports:
+    - "127.0.0.1:8080:8080"

templates/about.j2

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.j2" %}
 {% block title %}About{% endblock %}
 {% block head %}
     {{ super() }}
@@ -10,7 +10,7 @@
 <p>Languages: German, English</p>
 <p>Programming languages: Python, Bash, POSIX Shell, Powershell</p>
 <p>Markup languages: HTML, MD</p>
-<p>Structure languages: JSON, XML, YAML, TOML</p>
+<p>Structure languages: JSON, XML, YAML, TOML, Jinja2</p>
 <p>Query languages: SQL(MariaDB, SQLite3)</p>
 <p>Services managed: SSH, DNS, DHCP, AD, PF, UFW, NF-Tables,
 RDP(XRDP, Microsoft RDP), Webserver(Apache24, Nginx, OpenBSD-httpd,

templates/base.j2

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" data-theme="light">
 <head>
     {% block head %}
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -14,8 +14,9 @@
            <li><a href="/">Homepage</a></li>
            <li><a href="imprint">Imprint</a></li>
            <li><a href="about">About</a></li>
-           <li><a href="monitoring">Monitoring</a></li>
+           <li><a href="https://cloud.adrianux.net">Monitoring</a></li>
-           <li><a href="https://git.adrianux.net/ahoemann">Git</a></li>
+           <li><a href="https://git.adrianux.net/explore/repos">Git</a></li>
+           <li><a href="https://bin.adrianux.net">Bin</a></li>
          </ul>
 </nav>
 <body>

templates/homepage.j2

@@ -1,9 +1,9 @@
-{% extends "base.html" %}
+{% extends "base.j2" %}
 {% block title %}Homepage{% endblock %}
 {% block head %}
     {{ super() }}
 {% endblock %}
 {% block content %}
-<p>This is Adrian's homepage, checkout his running services and their state <a href="monitoring">here</a></p>
+<p>This is Adrian's homepage, checkout his running services and their state <a href="https://cloud.adrianux.net">here</a></p>
 <p>Yes, Adrian is refering to himself in the third person.</p>
 {% endblock %}

templates/imprint.j2

@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base.j2" %}
 {% block title %}Imprint{% endblock %}
 {% block head %}
     {{ super() }}

templates/monitoring.html

@@ -1,9 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Monitoring{% endblock %}
-{% block head %}
-    {{ super() }}
-{% endblock %}
-{% block content %}
-<p>Git status: {{ git_status }}</p>
-<p>Website status: {{ website_status }}</p>
-{% endblock %}