Compare commits
No commits in common. "master" and "monitor" have entirely different histories.
13 changed files with 69 additions and 93 deletions
|
@ -1,7 +0,0 @@
|
||||||
.forgejo
|
|
||||||
*compose.yml
|
|
||||||
Dockerfile
|
|
||||||
.git*
|
|
||||||
Jenkinsfile
|
|
||||||
LICENSE
|
|
||||||
README.md
|
|
|
@ -1 +0,0 @@
|
||||||
DEBUG_MODE=False
|
|
7
.forgejo/workflows/update.yaml
Normal file
7
.forgejo/workflows/update.yaml
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
on: [push]
|
||||||
|
jobs:
|
||||||
|
update:
|
||||||
|
runs-on: self-hosted
|
||||||
|
steps:
|
||||||
|
- run: sudo git -C /opt/Adrianux.net/ pull
|
||||||
|
- run: sudo systemctl restart adrianux
|
4
.gitignore
vendored
4
.gitignore
vendored
|
@ -1,4 +1,2 @@
|
||||||
.venv*
|
.venv
|
||||||
.env
|
|
||||||
__pycache__
|
__pycache__
|
||||||
*theia-workspace
|
|
14
Dockerfile
14
Dockerfile
|
@ -1,14 +0,0 @@
|
||||||
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" ]
|
|
61
README.md
61
README.md
|
@ -1,62 +1,37 @@
|
||||||
# Installation
|
# Installation
|
||||||
|
|
||||||
|
|
||||||
## Setting up the environment
|
## Setting up the environment
|
||||||
|
|
||||||
1. Create a virtual environment:
|
1. Create a virtual environment:
|
||||||
|
```bash
|
||||||
```sh
|
|
||||||
python3 -m venv .venv
|
python3 -m venv .venv
|
||||||
```
|
```
|
||||||
|
|
||||||
2. Activate the virtual environment:
|
2. Activate the virtual environment:
|
||||||
|
```bash
|
||||||
```sh
|
|
||||||
. .venv/bin/activate
|
. .venv/bin/activate
|
||||||
```
|
```
|
||||||
|
|
||||||
3. Install dependencies:
|
3. Install dependencies:
|
||||||
|
```bash
|
||||||
```sh
|
|
||||||
pip install requirements.txt
|
pip install requirements.txt
|
||||||
```
|
```
|
||||||
|
|
||||||
4. Set the environment variables:
|
```systemd
|
||||||
|
# /etc/systemd/system/adrianux.service
|
||||||
|
[Unit]
|
||||||
|
Description=WSGI app
|
||||||
|
After=network.target
|
||||||
|
|
||||||
```sh
|
[Service]
|
||||||
export DEBUGMODE=False
|
Type=simple
|
||||||
|
User=adrianux
|
||||||
|
WorkingDirectory=/opt/Adrianux.net
|
||||||
|
ExecStart=/opt/Adrianux.net/.venv/bin/waitress-serve --listen=127.0.0.1:8080 app:app
|
||||||
|
Restart=always
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
```
|
```
|
||||||
|
|
||||||
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 .
|
|
||||||
```
|
|
||||||
|
|
||||||
## Running the container
|
|
||||||
|
|
||||||
```sh
|
|
||||||
docker run adrianux:latest
|
|
||||||
```
|
|
||||||
# Docker Compose
|
|
||||||
|
|
||||||
```sh
|
|
||||||
docker compose up adrianux
|
|
||||||
```
|
|
||||||
|
|
31
app.py
31
app.py
|
@ -1,22 +1,39 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
from flask import Flask, render_template, url_for
|
from flask import Flask, render_template, redirect, url_for
|
||||||
import os
|
import requests
|
||||||
|
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
@app.route("/imprint")
|
@app.route("/imprint")
|
||||||
def root():
|
def root():
|
||||||
return render_template("imprint.j2")
|
return render_template("imprint.html")
|
||||||
|
|
||||||
@app.route("/about")
|
@app.route("/about")
|
||||||
def about():
|
def about():
|
||||||
return render_template("about.j2")
|
return render_template("about.html")
|
||||||
|
|
||||||
@app.route("/")
|
@app.route("/")
|
||||||
def homepage():
|
def homepage():
|
||||||
return render_template("homepage.j2")
|
return render_template("homepage.html")
|
||||||
|
|
||||||
|
@app.route("/monitoring")
|
||||||
|
def monitoring():
|
||||||
|
git_status = get_status("https://git.adrianux.net")
|
||||||
|
website_status = get_status("https://adrianux.net")
|
||||||
|
return render_template("monitoring.html", git_status = git_status, website_status = website_status )
|
||||||
|
|
||||||
|
def get_status_code(link):
|
||||||
|
requested_site = requests.get(link)
|
||||||
|
return requested_site.status_code
|
||||||
|
|
||||||
|
def get_status(link):
|
||||||
|
match get_status_code(link):
|
||||||
|
case 200:
|
||||||
|
return "ONLINE"
|
||||||
|
case 500:
|
||||||
|
return "ERROR"
|
||||||
|
case _:
|
||||||
|
return "OFFLINE"
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
app.run(debug=os.environ['DEBUG_MODE'])
|
app.run(debug=False)
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
---
|
|
||||||
services:
|
|
||||||
container_name: "adrianux"
|
|
||||||
image: "git.adrianux.net/ahoemann/adrianux.net:1.2.0"
|
|
||||||
env_file: .env
|
|
||||||
ports:
|
|
||||||
- "127.0.0.1:8080:8080"
|
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends "base.j2" %}
|
{% extends "base.html" %}
|
||||||
{% block title %}About{% endblock %}
|
{% block title %}About{% endblock %}
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{{ super() }}
|
{{ super() }}
|
||||||
|
@ -10,7 +10,7 @@
|
||||||
<p>Languages: German, English</p>
|
<p>Languages: German, English</p>
|
||||||
<p>Programming languages: Python, Bash, POSIX Shell, Powershell</p>
|
<p>Programming languages: Python, Bash, POSIX Shell, Powershell</p>
|
||||||
<p>Markup languages: HTML, MD</p>
|
<p>Markup languages: HTML, MD</p>
|
||||||
<p>Structure languages: JSON, XML, YAML, TOML, Jinja2</p>
|
<p>Structure languages: JSON, XML, YAML, TOML</p>
|
||||||
<p>Query languages: SQL(MariaDB, SQLite3)</p>
|
<p>Query languages: SQL(MariaDB, SQLite3)</p>
|
||||||
<p>Services managed: SSH, DNS, DHCP, AD, PF, UFW, NF-Tables,
|
<p>Services managed: SSH, DNS, DHCP, AD, PF, UFW, NF-Tables,
|
||||||
RDP(XRDP, Microsoft RDP), Webserver(Apache24, Nginx, OpenBSD-httpd,
|
RDP(XRDP, Microsoft RDP), Webserver(Apache24, Nginx, OpenBSD-httpd,
|
|
@ -1,5 +1,5 @@
|
||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en" data-theme="light">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
{% block head %}
|
{% block head %}
|
||||||
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
|
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
|
||||||
|
@ -14,9 +14,8 @@
|
||||||
<li><a href="/">Homepage</a></li>
|
<li><a href="/">Homepage</a></li>
|
||||||
<li><a href="imprint">Imprint</a></li>
|
<li><a href="imprint">Imprint</a></li>
|
||||||
<li><a href="about">About</a></li>
|
<li><a href="about">About</a></li>
|
||||||
<li><a href="https://cloud.adrianux.net">Monitoring</a></li>
|
<li><a href="monitoring">Monitoring</a></li>
|
||||||
<li><a href="https://git.adrianux.net/explore/repos">Git</a></li>
|
<li><a href="https://git.adrianux.net/ahoemann">Git</a></li>
|
||||||
<li><a href="https://bin.adrianux.net">Bin</a></li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
<body>
|
<body>
|
||||||
|
@ -26,8 +25,8 @@
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<footer class="container">
|
<footer class="container">
|
||||||
<p><a href="mailto:ahoemann@proton.me">ahoemann@proton.me</a>
|
<p><a href="mailto:ahoemann@proton.me">ahoemann@proton.me</a></p>
|
||||||
</p>Authored by <a href="https://adrianux.net/">Adrian Hoemann</a>.
|
© Copyright 2024 by <a href="https://adrianux.net/">Adrian Hoemann</a>.
|
||||||
</footer>
|
</footer>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
|
@ -1,9 +1,9 @@
|
||||||
{% extends "base.j2" %}
|
{% extends "base.html" %}
|
||||||
{% block title %}Homepage{% endblock %}
|
{% block title %}Homepage{% endblock %}
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{{ super() }}
|
{{ super() }}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<p>This is Adrian's homepage, checkout his running services and their state <a href="https://cloud.adrianux.net">here</a></p>
|
<p>This is Adrian's homepage, checkout his running services and their state <a href="monitoring">here</a></p>
|
||||||
<p>Yes, Adrian is refering to himself in the third person.</p>
|
<p>Yes, Adrian is refering to himself in the third person.</p>
|
||||||
{% endblock %}
|
{% endblock %}
|
|
@ -1,4 +1,4 @@
|
||||||
{% extends "base.j2" %}
|
{% extends "base.html" %}
|
||||||
{% block title %}Imprint{% endblock %}
|
{% block title %}Imprint{% endblock %}
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{{ super() }}
|
{{ super() }}
|
9
templates/monitoring.html
Normal file
9
templates/monitoring.html
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
{% 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 %}
|
Loading…
Add table
Reference in a new issue