mirror of
https://github.com/FAUSheppy/athq-vm-management
synced 2025-12-06 05:41:35 +01:00
Compare commits
3 Commits
bfd1c20c2b
...
e99e729a83
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e99e729a83 | ||
|
|
84cb2f9fb2 | ||
|
|
f71269d14b |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -8,3 +8,4 @@ password.txt
|
|||||||
ssh_config_for_clients
|
ssh_config_for_clients
|
||||||
virsh_backup
|
virsh_backup
|
||||||
.wireguard_keys
|
.wireguard_keys
|
||||||
|
master-address.txt
|
||||||
|
|||||||
10
backup.py
10
backup.py
@@ -3,6 +3,7 @@ import functools
|
|||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import json
|
import json
|
||||||
|
import sys
|
||||||
|
|
||||||
environment = jinja2.Environment(loader=jinja2.FileSystemLoader(searchpath="./templates"))
|
environment = jinja2.Environment(loader=jinja2.FileSystemLoader(searchpath="./templates"))
|
||||||
|
|
||||||
@@ -20,6 +21,15 @@ def createBackupScriptStructure(backupList, baseDomain="", icingaOnly=False, bac
|
|||||||
asyncIcingaConf = {}
|
asyncIcingaConf = {}
|
||||||
for backup in backupList:
|
for backup in backupList:
|
||||||
|
|
||||||
|
if not backup:
|
||||||
|
print("Warning: Empty backup mapping in List", file=sys.stderr)
|
||||||
|
continue
|
||||||
|
|
||||||
|
if type(backup) == str:
|
||||||
|
print(f"Warning: Backup Entry is a stirng instead of a dict-object ({backup})", file=sys.stderr)
|
||||||
|
continue
|
||||||
|
|
||||||
|
|
||||||
if backup.get("disabled"):
|
if backup.get("disabled"):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|||||||
2
vm.py
2
vm.py
@@ -69,6 +69,7 @@ class VM:
|
|||||||
isUDP = proto == "udp"
|
isUDP = proto == "udp"
|
||||||
proxy_timeout = portStruct.get("proxy_timeout") or "10s"
|
proxy_timeout = portStruct.get("proxy_timeout") or "10s"
|
||||||
extra_content = portStruct.get("extra-content")
|
extra_content = portStruct.get("extra-content")
|
||||||
|
targetportoverwrite = portStruct.get("targetportoverwrite")
|
||||||
|
|
||||||
compositeName = "-".join((self.hostname, name, portstring, proto))
|
compositeName = "-".join((self.hostname, name, portstring, proto))
|
||||||
|
|
||||||
@@ -78,6 +79,7 @@ class VM:
|
|||||||
component = template.render(targetip=self.ip, udp=isUDP, portstring=portstring,
|
component = template.render(targetip=self.ip, udp=isUDP, portstring=portstring,
|
||||||
transparent=transparent, proxy_timeout=proxy_timeout,
|
transparent=transparent, proxy_timeout=proxy_timeout,
|
||||||
comment=compositeName, extra_content=extra_content,
|
comment=compositeName, extra_content=extra_content,
|
||||||
|
targetportoverwrite=targetportoverwrite,
|
||||||
port_interfaces=port_interfaces)
|
port_interfaces=port_interfaces)
|
||||||
|
|
||||||
components.append(component)
|
components.append(component)
|
||||||
|
|||||||
Reference in New Issue
Block a user