From e1ccea94ca14348cb1e38bb36bde335be9f8604e Mon Sep 17 00:00:00 2001 From: Annika Wickert Date: Mon, 27 Nov 2023 21:52:17 +0000 Subject: [PATCH] Get rid of no longer needed committed Deleted code is good code --- nginx/domains/broker.ffmuc.net.conf | 38 ----------------------------- wgkex/wgkex-ffdon.service | 21 ---------------- wgkex/wgkex-ffdon.yaml | 25 ------------------- 3 files changed, 84 deletions(-) delete mode 100644 wgkex/wgkex-ffdon.service delete mode 100644 wgkex/wgkex-ffdon.yaml diff --git a/nginx/domains/broker.ffmuc.net.conf b/nginx/domains/broker.ffmuc.net.conf index a1283c3..498935d 100644 --- a/nginx/domains/broker.ffmuc.net.conf +++ b/nginx/domains/broker.ffmuc.net.conf @@ -6,11 +6,6 @@ upstream wgkex_backend { keepalive 32; } -upstream wgkex_ffdon_backend { - server broker.ov.ffmuc.net:5001; - keepalive 32; -} - server { listen 80; listen [::]:80; @@ -43,36 +38,3 @@ server { access_log /var/log/nginx/{{ domain }}_access.log json_normal; error_log /var/log/nginx/{{ domain }}_error.log; } - -server { - listen 80; - listen [::]:80; - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name ffdon.broker.ffmuc.net; - - root /srv/www/{{ domain }}; - - location /api { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Frame-Options SAMEORIGIN; - - proxy_http_version 1.1; - proxy_pass http://wgkex_ffdon_backend; - } - - location / { - if ($scheme = http) { - rewrite ^ https://$host$uri permanent; - } - } - - ssl_certificate /etc/letsencrypt/live/ffmuc.net/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/ffmuc.net/privkey.pem; - - access_log /var/log/nginx/{{ domain }}_access.log json_normal; - error_log /var/log/nginx/{{ domain }}_error.log; -} 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