gru/hosts_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixy z listy todo

Browse Source
This commit is contained in:
Mateusz Gruszczyński
2025-03-09 00:03:29 +01:00
parent 2904209332
commit a5c59f8a64
5 changed files with 71 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
templates/deploy_hosts_file.html
View File

@ -21,7 +21,14 @@
{% for host in hosts %}
<div class="form-check">
<input class="form-check-input" type="checkbox" name="hosts" value="{{ host.id }}" id="host{{ host.id }}">
<label class="form-check-label" for="host{{ host.id }}">{{ host.hostname }} ({{ host.type }})</label>
<label class="form-check-label" for="host{{ host.id }}">
{% if host.use_daemon and host.type == 'linux' and host.daemon_url %}
{{ host.daemon_ip }} - {{ host.resolved_daemon }}
{% else %}
{{ host.hostname }}
{% endif %}
({{ host.type }})
</label>
</div>
{% endfor %}
</div>

35
templates/server_list.html
View File

@ -29,6 +29,7 @@
<th>Wybrany plik /etc/hosts</th>
<th>Auto Deploy</th>
<th>Auto Backup</th>
<th>Wyłącz regex deploy</th> <!-- Nowa kolumna -->
<th>Akcje</th>
</tr>
</thead>
@ -36,15 +37,16 @@
{% for h in hosts %}
<tr>
<td>{{ h.id }}</td>
<td data-bs-toggle="tooltip" data-bs-placement="top" title="{{ h.resolved_hostname }}">
<td data-bs-toggle="tooltip" data-bs-placement="top"
title="{% if h.use_daemon and h.type == 'linux' and h.daemon_url %}{{ h.resolved_daemon }}{% else %}{{ h.resolved_hostname }}{% endif %}">
{% if h.use_daemon and h.type == 'linux' and h.daemon_url %}
{% set daemon_str = h.daemon_url.split('://') | last %}
{% set daemon_split = daemon_str.split(':') %}
<small>(Daemon IP: {{ daemon_split[0] }})</small>
{% set daemon_str = h.daemon_url.split('://') | last %}
{% set daemon_ip = daemon_str.split(':')[0] %}
{{ daemon_ip }}
{% else %}
{{ h.hostname }}
{% endif %}
</td>
</td>
<td>
{% if h.use_daemon and h.type == 'linux' %}
<em>—</em>
@ -81,7 +83,6 @@
{% endif %}
{% endif %}
</td>
<!-- Nowa kolumna: preferowany plik hosts -->
<td>
{% if h.preferred_hostfile %}
{{ h.preferred_hostfile.title }}
@ -89,7 +90,6 @@
(Default)
{% endif %}
</td>
<!-- Formularz aktualizujący auto_deploy -->
<td>
<form method="POST" action="{{ url_for('update_host_automation', id=h.id) }}" style="display:inline;">
<input type="hidden" name="setting" value="auto_deploy">
@ -97,7 +97,6 @@
onchange="this.form.submit()" {% if h.auto_deploy_enabled %}checked{% endif %}>
</form>
</td>
<!-- Formularz aktualizujący auto_backup -->
<td>
<form method="POST" action="{{ url_for('update_host_automation', id=h.id) }}" style="display:inline;">
<input type="hidden" name="setting" value="auto_backup">
@ -106,16 +105,26 @@
</form>
</td>
<td>
<a href="{{ url_for('edit_server', id=h.id) }}" class="btn btn-primary btn-sm">Edytuj</a>
<a href="{{ url_for('test_server_connection', id=h.id) }}" class="btn btn-info btn-sm">Testuj</a>
<a href="{{ url_for('server_backup', host_id=h.id) }}" class="btn btn-success btn-sm">Backup</a>
<form method="GET" action="{{ url_for('delete_server', id=h.id) }}" style="display:inline;">
<button type="submit" class="btn btn-danger btn-sm">Usuń</button>
<form method="POST" action="{{ url_for('update_host_automation', id=h.id) }}" style="display:inline;">
<input type="hidden" name="setting" value="disable_regex">
<input type="checkbox" name="enabled" value="1"
onchange="this.form.submit()" {% if h.disable_regex_deploy %}checked{% endif %}>
</form>
</td>
<td>
<div class="d-flex flex-wrap gap-1">
<a href="{{ url_for('edit_server', id=h.id) }}" class="btn btn-primary btn-sm">Edytuj</a>
<a href="{{ url_for('test_server_connection', id=h.id) }}" class="btn btn-info btn-sm">Testuj</a>
<a href="{{ url_for('server_backup', host_id=h.id) }}" class="btn btn-success btn-sm">Backup</a>
<form method="GET" action="{{ url_for('delete_server', id=h.id) }}" style="display:inline;">
<button type="submit" class="btn btn-danger btn-sm">Usuń</button>
</form>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>