diff --git a/wgkex/wgkex-ffdon.service b/wgkex/wgkex-ffdon.service deleted file mode 100644 index faba481..0000000 --- a/wgkex/wgkex-ffdon.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Wireguard Key Exchange Worker for Freifunk Donau-Ries segments -Documentation=https://github.com/freifunkMUC/wgkex -After=network-online.target - -[Service] -User=wgkex -Environment="WGKEX_CONFIG_FILE=/etc/wgkex-ffdon.yaml" -WorkingDirectory=/srv/wgkex -ExecStart=/usr/bin/python3 -u -m wgkex.worker.app -Restart=on-failure - -# Enable Logging -SyslogIdentifier=wgkex-ffdon - -# allow fetching metrics for wireguard -CapabilityBoundingSet=CAP_NET_ADMIN -AmbientCapabilities=CAP_NET_ADMIN - -[Install] -WantedBy=multi-user.target diff --git a/wgkex/wgkex-ffdon.yaml b/wgkex/wgkex-ffdon.yaml deleted file mode 100644 index 0b6b236..0000000 --- a/wgkex/wgkex-ffdon.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- - -domains: - - ffdon_test -domain_prefix: ffdon_ -mqtt: - broker_url: broker.ov.ffmuc.net - username: - password: - tls: False - broker_port: 1884 - keepalive: 20 -logging_config: - formatters: - standard: - format: '%(asctime)s,%(msecs)d %(levelname)-8s [%(filename)s:%(lineno)d] %(message)s' - handlers: - console: - class: logging.StreamHandler - formatter: standard - root: - handlers: - - console - level: INFO - version: 1 diff --git a/wgkex/wgkex.yaml b/wgkex/wgkex.yaml index d8d500a..e0550f6 100644 --- a/wgkex/wgkex.yaml +++ b/wgkex/wgkex.yaml @@ -1,7 +1,6 @@ --- domains: - - ffmuc_ffdon_test - ffmuc_augsburg - ffmuc_freising - ffmuc_gauting @@ -15,6 +14,11 @@ domains: - ffmuc_uml_sued - ffmuc_uml_west - ffmuc_welt + - ffdon_mitte + - ffdon_nordwest + - ffdon_sued + - ffwert_city + - ffwert_events mqtt: broker_url: broker.ov.ffmuc.net username: @@ -22,7 +26,10 @@ mqtt: tls: False broker_port: 1883 keepalive: 20 -domain_prefix: ffmuc_ +domain_prefixes: + - ffmuc_ + - ffdon_ + - ffwert_ logging_config: formatters: standard: