Invario/Key-service-Server
3
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Add admin instance management and system tools

Browse Source 
- Implemented sync_dev_hosts.sh for managing local hosts entries for development.
- Created admin_instances.html for managing school instances, including creation and listing.
- Developed admin_system.html for core services management, including restart and backup operations.
- Added my_instance.html for users to view and manage their assigned instances.
- Introduced provision_instance.sh for provisioning new instances with Docker, including Nginx configuration and SSL certificate handling.
This commit is contained in:
AIIrondev
2026-04-14 22:12:14 +02:00
parent 5ad0522770
commit c4a483a57c
17 changed files with 2631 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Website/templates/admin_dashboard.html
+4
View File
@@ -274,6 +274,10 @@
<p><strong>Team verwalten:</strong> Bilder, Rolle und Arbeit der zwei Team-Cards zentral pflegen.</p>
<a href="{{ url_for('admin_team') }}">Team Cards öffnen</a>
</div>
<div class="quick-admin-link">
<p><strong>Schul-Instanzen:</strong> Neue Subdomain-Instanzen für Schulen aus dem Inventarsystem-Repository starten.</p>
<a href="{{ url_for('admin_instances') }}">Instanzen öffnen</a>
</div>
<h2>Buchungsanfragen verwalten</h2>
<div class="block-days-section">
<h3>Kalender-Tage sperren</h3>
Website/templates/admin_instances.html
+308
View File
@@ -0,0 +1,308 @@
{% extends "base.html" %}
{% block title %}Admin | Instanzen{% endblock %}
{% block content %}
<section class="instance-header">
<h1>Schul-Instanzen starten</h1>
<p>Neue Instanzen des Inventarsystems für Subdomains pro Schule anlegen, sowie die Bibliothek dauerhaft aktivieren oder deaktivieren.</p>
</section>
<section class="instance-form-wrap">
<form method="post" class="instance-form">
<input type="hidden" name="action" value="create">
<label for="owner_username">Zugewiesener Nutzer</label>
<select id="owner_username" name="owner_username" required {% if not available_users %}disabled{% endif %}>
{% if available_users %}
<option value="">Nutzer wählen</option>
{% for user in available_users %}
<option value="{{ user.username }}" data-school-name="{{ user.display_name or user.username }}">{{ user.username }}{% if user.display_name %} - {{ user.display_name }}{% endif %}</option>
{% endfor %}
{% else %}
<option value="">Keine freien Nutzer verfügbar</option>
{% endif %}
</select>
{% if not available_users %}
<p class="warn-text">Alle Nutzer sind bereits einer Instanz zugewiesen. Lege einen neuen Nutzer an oder lösche eine bestehende Instanz.</p>
{% endif %}
<label for="school_name">Schulname</label>
<input id="school_name" name="school_name" type="text" placeholder="wird aus dem Nutzer übernommen" required>
<label for="app_image_tag">Version</label>
<select id="app_image_tag" name="app_image_tag" required>
{% for version in version_options %}
<option value="{{ version }}">{{ version }}</option>
{% endfor %}
</select>
<label for="subdomain">Subdomain (optional)</label>
<input id="subdomain" name="subdomain" type="text" placeholder="wird aus Schulname abgeleitet">
<label class="check-row">
<input type="checkbox" name="library_enabled" value="1">
Bibliothek aktivieren
</label>
<button type="submit">Instanz erstellen und starten</button>
</form>
<aside class="instance-meta">
<h2>Systemdaten</h2>
<p><strong>Repository:</strong> {{ instance_repo_url }}</p>
<p><strong>Basis-Domain:</strong> {{ parent_domain }}</p>
<p><strong>Instanz-Pfad:</strong> {{ base_dir }}</p>
<p><strong>Provisioning-Skript:</strong> {{ provision_script }}</p>
<p class="note">Hinweis: Für Docker- und Nginx-Operationen benötigt der laufende Prozess die passenden Host-Berechtigungen.</p>
</aside>
</section>
<section class="instance-table-wrap">
<h2>Vorhandene Instanzen</h2>
{% if instances %}
<table>
<thead>
<tr>
<th>Schule</th>
<th>Nutzer</th>
<th>Subdomain</th>
<th>Version</th>
<th>Bibliothek</th>
<th>Aktion</th>
<th>HTTPS-Port</th>
<th>Status</th>
<th>Nginx</th>
<th>Letzte Meldung</th>
<th>Aktualisiert</th>
</tr>
</thead>
<tbody>
{% for item in instances %}
<tr>
<td>{{ item.school_name }}</td>
<td>{{ item.owner_username or '-' }}</td>
<td>
{% if item.domain %}
<a class="instance-domain-link" href="https://{{ item.domain }}" target="_blank" rel="noopener noreferrer">{{ item.domain }}</a>
{% else %}
-
{% endif %}
</td>
<td>{{ item.app_image_tag or 'latest' }}</td>
<td>{{ 'an' if item.library_enabled else 'aus' }}</td>
<td>
<form method="post" class="inline-toggle-form">
<input type="hidden" name="action" value="toggle_library">
<input type="hidden" name="subdomain" value="{{ item.subdomain }}">
<input type="hidden" name="library_enabled" value="{{ 0 if item.library_enabled else 1 }}">
<button type="submit">{{ 'Bibliothek deaktivieren' if item.library_enabled else 'Bibliothek aktivieren' }}</button>
</form>
<form method="post" class="inline-toggle-form" onsubmit="return confirm('Instanz {{ item.subdomain }} wirklich löschen? Dieser Vorgang entfernt Container, Daten und Konfiguration.');">
<input type="hidden" name="action" value="delete">
<input type="hidden" name="subdomain" value="{{ item.subdomain }}">
<button type="submit" class="danger">Instanz löschen</button>
</form>
</td>
<td>{{ item.https_port or '-' }}</td>
<td>
<span class="pill {{ 'ok' if item.status == 'Läuft' else 'error' }}">{{ item.status }}</span>
</td>
<td>{{ item.nginx_status }}</td>
<td>{{ item.last_message }}</td>
<td>{{ item.updated_at }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<p>Noch keine Instanzen vorhanden.</p>
{% endif %}
</section>
<style>
.instance-header {
margin-bottom: 1rem;
}
.instance-form-wrap {
display: grid;
grid-template-columns: 1.2fr 1fr;
gap: 1rem;
margin-bottom: 1.2rem;
}
.instance-form,
.instance-meta,
.instance-table-wrap {
border: 1px solid #d8e1e8;
background: #ffffff;
border-radius: 14px;
padding: 1rem;
}
.instance-form {
display: grid;
gap: 0.5rem;
}
.instance-form input,
.instance-form select {
border: 1px solid #bcd0de;
border-radius: 10px;
padding: 0.55rem 0.65rem;
font: inherit;
}
.check-row {
display: flex;
align-items: center;
gap: 0.45rem;
margin-top: 0.2rem;
font-weight: 600;
}
.instance-form button {
margin-top: 0.4rem;
border: none;
border-radius: 999px;
padding: 0.55rem 0.95rem;
font-weight: 700;
cursor: pointer;
color: #ffffff;
background: linear-gradient(120deg, #0b5b89 0%, #0b4262 100%);
}
.warn-text {
margin: 0.2rem 0 0.1rem;
color: #8b2a27;
font-size: 0.9rem;
font-weight: 600;
}
.instance-domain-link {
color: #0b5b89;
font-weight: 700;
text-decoration: none;
}
.instance-domain-link:hover {
text-decoration: underline;
}
.inline-toggle-form {
margin: 0;
}
.inline-toggle-form + .inline-toggle-form {
margin-top: 0.35rem;
}
.inline-toggle-form button {
border: 1px solid #bcd0de;
background: #ffffff;
color: #173f5a;
border-radius: 999px;
padding: 0.35rem 0.68rem;
font: inherit;
font-weight: 700;
cursor: pointer;
}
.inline-toggle-form button:hover {
background: #f2f8fc;
}
.inline-toggle-form button.danger {
border-color: #e3adad;
color: #8b2a27;
background: #fef2f2;
}
.inline-toggle-form button.danger:hover {
background: #fde4e4;
}
.instance-meta h2,
.instance-table-wrap h2 {
margin: 0 0 0.5rem;
}
.instance-meta p {
margin: 0.28rem 0;
font-size: 0.92rem;
}
.instance-meta .note {
margin-top: 0.65rem;
padding-top: 0.65rem;
border-top: 1px dashed #c7d2db;
}
.instance-table-wrap {
overflow-x: auto;
}
table {
width: 100%;
border-collapse: collapse;
}
th,
td {
text-align: left;
border-bottom: 1px solid #e7edf3;
padding: 0.62rem;
vertical-align: top;
font-size: 0.9rem;
}
.pill {
display: inline-flex;
border-radius: 999px;
padding: 0.18rem 0.62rem;
font-weight: 700;
font-size: 0.78rem;
}
.pill.ok {
background: #eaf8f1;
border: 1px solid #8cc9a6;
color: #0f5c3a;
}
.pill.error {
background: #fef2f2;
border: 1px solid #e3adad;
color: #8b2a27;
}
@media (max-width: 900px) {
.instance-form-wrap {
grid-template-columns: 1fr;
}
}
</style>
<script>
(function() {
const ownerSelect = document.getElementById('owner_username');
const schoolInput = document.getElementById('school_name');
if (!ownerSelect || !schoolInput) {
return;
}
const updateSchoolName = () => {
const selectedOption = ownerSelect.options[ownerSelect.selectedIndex];
const schoolName = selectedOption ? (selectedOption.dataset.schoolName || '') : '';
if (schoolName) {
schoolInput.value = schoolName;
}
};
ownerSelect.addEventListener('change', updateSchoolName);
updateSchoolName();
})();
</script>
{% endblock %}
Website/templates/admin_system.html
+131
View File
@@ -0,0 +1,131 @@
{% extends "base.html" %}
{% block title %}Admin | System-Tools{% endblock %}
{% block content %}
<section class="head">
<h1>System-Tools</h1>
<p>Nützliche Admin-Funktionen für Betrieb, Backup, Update, Restart und Log-Download.</p>
</section>
<section class="core-tools">
<h2>Core-Services</h2>
<div class="actions">
<form method="post">
<input type="hidden" name="action" value="restart_core">
<button type="submit">Website + MongoDB neu starten</button>
</form>
<a class="action-link" href="{{ url_for('admin_download_core_logs') }}">Core-Logs herunterladen</a>
</div>
</section>
<section class="instance-tools">
<h2>Instanz-Operationen</h2>
{% if instances %}
<table>
<thead>
<tr>
<th>Schule</th>
<th>Subdomain</th>
<th>Status</th>
<th>Aktionen</th>
</tr>
</thead>
<tbody>
{% for item in instances %}
<tr>
<td>{{ item.school_name }}</td>
<td>{{ item.subdomain }}</td>
<td>{{ item.status }} / {{ item.nginx_status }}</td>
<td>
<div class="actions row-actions">
<form method="post">
<input type="hidden" name="action" value="backup_instance">
<input type="hidden" name="subdomain" value="{{ item.subdomain }}">
<button type="submit">Backup</button>
</form>
<form method="post">
<input type="hidden" name="action" value="update_instance">
<input type="hidden" name="subdomain" value="{{ item.subdomain }}">
<button type="submit">Update</button>
</form>
<form method="post">
<input type="hidden" name="action" value="restart_instance">
<input type="hidden" name="subdomain" value="{{ item.subdomain }}">
<button type="submit">Restart</button>
</form>
<a class="action-link" href="{{ url_for('admin_download_instance_logs', subdomain=item.subdomain) }}">Logs</a>
</div>
<form method="post" class="inline-admin-form">
<input type="hidden" name="action" value="create_instance_admin">
<input type="hidden" name="subdomain" value="{{ item.subdomain }}">
<input type="text" name="admin_username" placeholder="Admin-Username" required>
<input type="password" name="admin_password" placeholder="Passwort (>=8)" required>
<input type="text" name="admin_first_name" placeholder="Vorname" value="Admin">
<input type="text" name="admin_last_name" placeholder="Nachname" value="User">
<button type="submit">Admin erstellen</button>
</form>
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<p>Keine Instanzen vorhanden.</p>
{% endif %}
</section>
<style>
.head { margin-bottom: 1rem; }
.core-tools,
.instance-tools {
border: 1px solid #d8e1e8;
background: #ffffff;
border-radius: 14px;
padding: 1rem;
margin-bottom: 1rem;
}
.actions { display: flex; flex-wrap: wrap; gap: 0.55rem; align-items: center; }
.row-actions { gap: 0.4rem; }
.actions form { margin: 0; }
.inline-admin-form {
margin-top: 0.55rem;
display: grid;
grid-template-columns: repeat(5, minmax(0, 1fr));
gap: 0.38rem;
}
.inline-admin-form input {
border: 1px solid #bcd0de;
border-radius: 8px;
padding: 0.38rem 0.5rem;
font: inherit;
min-width: 0;
}
button,
.action-link {
border: 1px solid #bcd0de;
background: #ffffff;
padding: 0.42rem 0.72rem;
border-radius: 999px;
font-weight: 700;
cursor: pointer;
text-decoration: none;
color: #173f5a;
display: inline-flex;
align-items: center;
}
button:hover,
.action-link:hover { background: #f2f8fc; }
table { width: 100%; border-collapse: collapse; }
th, td {
text-align: left;
border-bottom: 1px solid #e7edf3;
padding: 0.62rem;
vertical-align: top;
}
@media (max-width: 860px) {
.actions { display: grid; }
.inline-admin-form { grid-template-columns: 1fr; }
}
</style>
{% endblock %}
Website/templates/admin_users.html
+17
View File
@@ -15,6 +15,7 @@
<th>Benutzername</th>
<th>Name</th>
<th>Rolle</th>
<th>Instanz-Links</th>
<th>Aktionen</th>
</tr>
</thead>
@@ -24,6 +25,18 @@
<td>{{ user.username }}</td>
<td>{{ user.display_name }}</td>
<td>{{ 'Admin' if user.is_admin else 'Nutzer' }}</td>
<td>
{% set user_instances = instances_by_owner.get(user.username, []) %}
{% if user_instances %}
<div class="instance-links">
{% for inst in user_instances %}
<a href="https://{{ inst.domain }}" target="_blank" rel="noopener noreferrer">{{ inst.domain }}</a>
{% endfor %}
</div>
{% else %}
<span class="no-instance">Keine zugewiesene Instanz</span>
{% endif %}
</td>
<td>
<form method="post" class="actions">
<input type="hidden" name="username" value="{{ user.username }}">
@@ -51,6 +64,10 @@
table { width: 100%; border-collapse: collapse; }
th, td { text-align: left; padding: 0.7rem; border-bottom: 1px solid #e8eef2; }
.actions { display: flex; flex-wrap: wrap; gap: 0.5rem; align-items: center; }
.instance-links { display: grid; gap: 0.35rem; }
.instance-links a { color: #0b5b89; font-weight: 600; text-decoration: none; }
.instance-links a:hover { text-decoration: underline; }
.no-instance { color: #5e7283; }
select { border: 1px solid #bcd0de; background: #fff; padding: 0.4rem 0.55rem; border-radius: 10px; font: inherit; }
button { border: 1px solid #bcd0de; background: #fff; padding: 0.4rem 0.65rem; border-radius: 999px; font-weight: 700; cursor: pointer; }
</style>
Website/templates/base.html
+3
View File
@@ -385,6 +385,7 @@
<div class="dropdown-menu">
<a href="{{ url_for('my_licenses') }}">Meine Lizenzen</a>
<a href="{{ url_for('my_invoices') }}">Meine Rechnungen</a>
<a href="{{ url_for('my_instance_management') }}">Meine Instanz</a>
<a href="{{ url_for('user_chat') }}">Chat mit Admin</a>
<a href="{{ url_for('user_tickets') }}">Support Tickets</a>
</div>
@@ -401,8 +402,10 @@
<a href="{{ url_for('admin_invoices') }}">Rechnungsverwaltung</a>
<a href="{{ url_for('admin_chats') }}">Admin-Chat</a>
<a href="{{ url_for('admin_tickets') }}">Support-Center</a>
<a href="{{ url_for('admin_system_tools') }}">System-Tools</a>
<a href="{{ url_for('admin_blog') }}">Blog verwalten</a>
<a href="{{ url_for('admin_team') }}">Team Cards</a>
<a href="{{ url_for('admin_instances') }}">Schul-Instanzen</a>
</div>
</details>
{% endif %}
Website/templates/my_instance.html
+41
View File
@@ -0,0 +1,41 @@
{% extends "base.html" %}
{% block title %}Meine Instanz{% endblock %}
{% block content %}
<section class="instance-head">
<h1>Meine Instanzverwaltung</h1>
<p>Hier sehen Sie ausschließlich Ihre zugewiesene Instanz und können diese direkt nutzen.</p>
</section>
<section class="instance-card">
<h2>Instanzdaten</h2>
{% if instance %}
<p><strong>Schule:</strong> {{ instance.school_name }}</p>
<p><strong>Domain:</strong> {{ instance.domain }}</p>
<p><strong>Subdomain:</strong> {{ instance.subdomain }}</p>
<p><strong>HTTPS-Port:</strong> {{ instance.https_port or '-' }}</p>
<p><strong>Status:</strong> {{ instance.status }}</p>
<p><strong>Nginx:</strong> {{ instance.nginx_status }}</p>
<p><strong>Letzte Meldung:</strong> {{ instance.last_message }}</p>
<p><strong>Aktualisiert:</strong> {{ instance.updated_at }}</p>
<p><strong>Zugang:</strong> <a href="https://{{ instance.domain }}" target="_blank" rel="noopener noreferrer">https://{{ instance.domain }}</a></p>
{% else %}
<p>Für Ihr Konto ist aktuell keine Instanz zugewiesen.</p>
<p>Bitte wenden Sie sich an den Administrator, um eine Instanz zugewiesen zu bekommen.</p>
{% endif %}
</section>
<style>
.instance-head { margin-bottom: 1rem; }
.instance-card {
max-width: 780px;
border: 1px solid #d8e1e8;
border-radius: 14px;
background: #ffffff;
padding: 1rem;
}
.instance-card h2 { margin: 0 0 0.6rem; }
.instance-card p { margin: 0.28rem 0; }
</style>
{% endblock %}