Mehrere Subdomains pro Benutzer + README
- subdomains-Tabelle (n DNS-Namen je Benutzer) inkl. Migration vom alten Einzel-Subdomain-Schema in database.init_db() - Benutzeranlage/Verwaltung: mehrere Subdomains hinzufuegen/entfernen - /nic/update aktualisiert alle Subdomains des Benutzers bzw. die per ?hostname= gewaehlte(n); eine Antwortzeile je Subdomain - Dashboard/Users-Templates auf das neue Modell umgestellt - README.md mit Setup, Plesk-Konfig, Router-Einrichtung und Endpoint-Doku - .gitignore: __pycache__/ und *.pyc Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Stefan Hacker
@@ -10,19 +10,19 @@
|
||||
<div class="row g-3 mb-4">
|
||||
<div class="col-sm-4">
|
||||
<div class="card text-center p-3">
|
||||
<div class="fs-2 fw-bold text-primary">{{ users|length }}</div>
|
||||
<div class="fs-2 fw-bold text-primary">{{ user_count }}</div>
|
||||
<div class="text-muted small">Benutzer gesamt</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<div class="card text-center p-3">
|
||||
<div class="fs-2 fw-bold text-success">{{ users|selectattr('active', 'equalto', 1)|list|length }}</div>
|
||||
<div class="text-muted small">Aktiv</div>
|
||||
<div class="fs-2 fw-bold text-success">{{ subdomains|length }}</div>
|
||||
<div class="text-muted small">Subdomains</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<div class="card text-center p-3">
|
||||
<div class="fs-2 fw-bold text-info">{{ users|sum(attribute='update_count') }}</div>
|
||||
<div class="fs-2 fw-bold text-info">{{ subdomains|sum(attribute='update_count') }}</div>
|
||||
<div class="text-muted small">Updates gesamt</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -31,15 +31,15 @@
|
||||
<!-- User table -->
|
||||
<div class="card mb-4">
|
||||
<div class="card-header d-flex justify-content-between align-items-center">
|
||||
<span class="fw-semibold">Benutzer & aktuelle IPs</span>
|
||||
<span class="fw-semibold">Subdomains & aktuelle IPs</span>
|
||||
<a href="{{ url_for('users') }}" class="btn btn-sm btn-outline-primary">Verwalten</a>
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<table class="table table-hover mb-0">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Subdomain</th>
|
||||
<th>Hostname</th>
|
||||
<th>DynDNS-User</th>
|
||||
<th>Aktuelle IP</th>
|
||||
<th>Letztes Update</th>
|
||||
<th>Updates</th>
|
||||
@@ -47,23 +47,23 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for u in users %}
|
||||
{% for s in subdomains %}
|
||||
<tr>
|
||||
<td class="fw-semibold">{{ u.subdomain }}</td>
|
||||
<td class="text-muted small">
|
||||
{% if base_domain %}{{ u.subdomain }}.{{ base_domain }}{% else %}—{% endif %}
|
||||
<td class="fw-semibold font-monospace small">
|
||||
{% if base_domain %}{{ s.subdomain }}.{{ base_domain }}{% else %}{{ s.subdomain }}{% endif %}
|
||||
</td>
|
||||
<td>{{ s.username }}</td>
|
||||
<td>
|
||||
{% if u.current_ip %}
|
||||
<span class="badge bg-secondary badge-ip">{{ u.current_ip }}</span>
|
||||
{% if s.current_ip %}
|
||||
<span class="badge bg-secondary badge-ip">{{ s.current_ip }}</span>
|
||||
{% else %}
|
||||
<span class="text-muted">noch kein Update</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="text-muted small">{{ u.last_updated or '—' }}</td>
|
||||
<td>{{ u.update_count }}</td>
|
||||
<td class="text-muted small">{{ s.last_updated or '—' }}</td>
|
||||
<td>{{ s.update_count }}</td>
|
||||
<td>
|
||||
{% if u.active %}
|
||||
{% if s.active %}
|
||||
<span class="badge bg-success">Aktiv</span>
|
||||
{% else %}
|
||||
<span class="badge bg-secondary">Inaktiv</span>
|
||||
@@ -71,7 +71,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr><td colspan="6" class="text-center text-muted py-4">Noch keine Benutzer angelegt.</td></tr>
|
||||
<tr><td colspan="6" class="text-center text-muted py-4">Noch keine Subdomains angelegt.</td></tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
@@ -96,7 +96,7 @@
|
||||
{% for l in logs %}
|
||||
<tr>
|
||||
<td class="text-muted small">{{ l.timestamp }}</td>
|
||||
<td>{{ l.subdomain }} <span class="text-muted small">({{ l.dyndns_username }})</span></td>
|
||||
<td>{{ l.subdomain or '—' }} <span class="text-muted small">({{ l.dyndns_username }})</span></td>
|
||||
<td class="badge-ip text-muted small">{{ l.old_ip or '—' }}</td>
|
||||
<td><span class="badge bg-secondary badge-ip">{{ l.new_ip }}</span></td>
|
||||
<td>
|
||||
|
||||
+66
-38
@@ -11,32 +11,35 @@
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body p-0">
|
||||
<table class="table table-hover mb-0">
|
||||
<table class="table table-hover mb-0 align-middle">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Subdomain</th>
|
||||
<th>Hostname</th>
|
||||
<th>DynDNS-User</th>
|
||||
<th>Aktuelle IP</th>
|
||||
<th>Letztes Update</th>
|
||||
<th>Subdomains</th>
|
||||
<th>Status</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for u in users %}
|
||||
{% for item in users %}
|
||||
{% set u = item.row %}
|
||||
<tr>
|
||||
<td class="fw-semibold">{{ u.subdomain }}</td>
|
||||
<td class="text-muted small font-monospace">
|
||||
{% if base_domain %}{{ u.subdomain }}.{{ base_domain }}{% else %}—{% endif %}
|
||||
</td>
|
||||
<td>{{ u.username }}</td>
|
||||
<td class="fw-semibold">{{ u.username }}</td>
|
||||
<td>
|
||||
{% if u.current_ip %}
|
||||
<span class="badge bg-secondary font-monospace">{{ u.current_ip }}</span>
|
||||
{% else %}<span class="text-muted">—</span>{% endif %}
|
||||
{% for s in item.subdomains %}
|
||||
<span class="badge bg-light text-dark border me-1 mb-1 font-monospace">
|
||||
{% if base_domain %}{{ s.subdomain }}.{{ base_domain }}{% else %}{{ s.subdomain }}{% endif %}
|
||||
{% if s.current_ip %}<span class="text-muted">· {{ s.current_ip }}</span>{% endif %}
|
||||
<form method="post" action="{{ url_for('subdomain_delete', subdomain_id=s.id) }}"
|
||||
class="d-inline" onsubmit="return confirm('Subdomain {{ s.subdomain }} löschen?');">
|
||||
<button type="submit" class="btn btn-link btn-sm p-0 ms-1 text-danger" title="Subdomain löschen"
|
||||
style="vertical-align: baseline;"><i class="bi bi-x-lg"></i></button>
|
||||
</form>
|
||||
</span>
|
||||
{% else %}
|
||||
<span class="text-muted small">keine</span>
|
||||
{% endfor %}
|
||||
</td>
|
||||
<td class="text-muted small">{{ u.last_updated or '—' }}</td>
|
||||
<td>
|
||||
{% if u.active %}
|
||||
<span class="badge bg-success">Aktiv</span>
|
||||
@@ -46,9 +49,13 @@
|
||||
</td>
|
||||
<td class="text-end">
|
||||
<div class="btn-group btn-group-sm">
|
||||
<button class="btn btn-outline-success"
|
||||
data-bs-toggle="modal" data-bs-target="#subModal{{ u.id }}"
|
||||
title="Subdomain hinzufügen">
|
||||
<i class="bi bi-plus-lg"></i>
|
||||
</button>
|
||||
<button class="btn btn-outline-secondary"
|
||||
data-bs-toggle="modal"
|
||||
data-bs-target="#editModal{{ u.id }}"
|
||||
data-bs-toggle="modal" data-bs-target="#editModal{{ u.id }}"
|
||||
title="Bearbeiten">
|
||||
<i class="bi bi-pencil"></i>
|
||||
</button>
|
||||
@@ -58,8 +65,7 @@
|
||||
</button>
|
||||
</form>
|
||||
<button class="btn btn-outline-danger"
|
||||
data-bs-toggle="modal"
|
||||
data-bs-target="#delModal{{ u.id }}"
|
||||
data-bs-toggle="modal" data-bs-target="#delModal{{ u.id }}"
|
||||
title="Löschen">
|
||||
<i class="bi bi-trash"></i>
|
||||
</button>
|
||||
@@ -67,6 +73,35 @@
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<!-- Add-subdomain modal -->
|
||||
<div class="modal fade" id="subModal{{ u.id }}" tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Subdomain(s) zu „{{ u.username }}" hinzufügen</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<form method="post" action="{{ url_for('subdomain_add', user_id=u.id) }}">
|
||||
<div class="modal-body">
|
||||
<label class="form-label">Subdomain(s)</label>
|
||||
<div class="input-group">
|
||||
<textarea name="subdomains" class="form-control font-monospace" rows="3"
|
||||
placeholder="mypc nas router" required></textarea>
|
||||
{% if base_domain %}
|
||||
<span class="input-group-text text-muted">.{{ base_domain }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="form-text">Mehrere durch Komma, Leerzeichen oder Zeilenumbruch trennen.</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
|
||||
<button type="submit" class="btn btn-primary">Hinzufügen</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Edit modal -->
|
||||
<div class="modal fade" id="editModal{{ u.id }}" tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
@@ -86,16 +121,8 @@
|
||||
<label class="form-label">Neues Passwort <span class="text-muted">(leer = unverändert)</span></label>
|
||||
<input name="password" type="password" class="form-control">
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Subdomain</label>
|
||||
<div class="input-group">
|
||||
<input name="subdomain" type="text" class="form-control font-monospace"
|
||||
value="{{ u.subdomain }}" required>
|
||||
{% if base_domain %}
|
||||
<span class="input-group-text text-muted">.{{ base_domain }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-text">Subdomains werden direkt in der Tabelle per
|
||||
<i class="bi bi-plus-lg"></i> / <i class="bi bi-x-lg"></i> verwaltet.</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
|
||||
@@ -115,8 +142,8 @@
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<strong>{{ u.username }}</strong> ({{ u.subdomain }}) wirklich löschen?
|
||||
Alle Update-Logs werden ebenfalls entfernt.
|
||||
<strong>{{ u.username }}</strong> mit {{ item.subdomains|length }} Subdomain(s)
|
||||
wirklich löschen? Alle Update-Logs werden ebenfalls entfernt.
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Abbrechen</button>
|
||||
@@ -129,7 +156,7 @@
|
||||
</div>
|
||||
|
||||
{% else %}
|
||||
<tr><td colspan="7" class="text-center text-muted py-4">
|
||||
<tr><td colspan="4" class="text-center text-muted py-4">
|
||||
Noch keine Benutzer. <a href="#" data-bs-toggle="modal" data-bs-target="#addModal">Jetzt anlegen.</a>
|
||||
</td></tr>
|
||||
{% endfor %}
|
||||
@@ -160,17 +187,18 @@
|
||||
<div class="form-text">Wird im Speedport als „Passwort" eingetragen.</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label">Subdomain</label>
|
||||
<label class="form-label">Subdomain(s)</label>
|
||||
<div class="input-group">
|
||||
<input name="subdomain" type="text" class="form-control font-monospace"
|
||||
placeholder="mypc" required
|
||||
pattern="[a-z0-9]([a-z0-9\-]*[a-z0-9])?"
|
||||
title="Kleinbuchstaben, Ziffern und Bindestriche">
|
||||
<textarea name="subdomains" class="form-control font-monospace" rows="3"
|
||||
placeholder="mypc nas router" required></textarea>
|
||||
{% if base_domain %}
|
||||
<span class="input-group-text text-muted">.{{ base_domain }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="form-text">Nur Kleinbuchstaben, Ziffern und Bindestriche.</div>
|
||||
<div class="form-text">
|
||||
Eine oder mehrere — durch Komma, Leerzeichen oder Zeilenumbruch getrennt.
|
||||
Nur Kleinbuchstaben, Ziffern, Bindestriche und Punkte.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
|
||||
Reference in New Issue
Block a user