various cleanups

freifunkMUC · Dec 12, 2020 · bc1706d · bc1706d
1 parent 3d29c76
commit bc1706d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 69 deletions.
diff --git a/bash/bash_aliases.root b/bash/bash_aliases.root
diff --git a/knot-resolver/kresd.override.socket b/knot-resolver/kresd.override.socket
@@ -14,7 +14,11 @@ ListenDatagram={{ ipaddress["address"].split('/')[0] }}:53
 ListenStream={{ ipaddress["address"].split('/')[0] }}:53
 {%- endif %}
 {% endfor %}
-{%- set dhcp_prefixes = salt['site_prefixes.get_site_prefixes'](salt['pillar.get']('netbox:config_context:site_prefixes:netbox_token'), salt['pillar.get']('netbox:config_context:site_prefixes:netbox_url')) %}
+{% set dhcp_prefixes = salt['site_prefixes.get_site_prefixes'](
+	salt['pillar.get']('netbox:config_context:netbox:api_url'),
+	salt['pillar.get']('netbox:config_context:site_prefixes:netbox_token'),
+	salt['pillar.get']('netbox:config_context:site_prefixes:netbox_filter')
+) %}
 {%- for name in dhcp_prefixes %}
 {%- for ip in salt['grains.get']('ipv4') %}
 {%- if salt['network.ip_in_subnet'](ip, dhcp_prefixes[name])  %}

diff --git a/nebula-meet/files/config.yml.jinja b/nebula-meet/files/config.yml.jinja
@@ -1,4 +1,5 @@
 {%- from "nebula-meet/map.jinja" import nebula with context %}
+{% do nebula.lighthouses.pop("127.0.0.1", None) %}
 
 pki:
   ca: /etc/nebula-meet/ca.crt

diff --git a/nginx/domains/apt.ffmuc.net.conf b/nginx/domains/apt.ffmuc.net.conf
@@ -23,7 +23,6 @@ server {
         proxy_cache_valid 200 302 3d;
         proxy_cache_valid 404 1m;
         proxy_cache_revalidate on;
-        proxy_cache_min_uses 2;
         proxy_cache_use_stale timeout;
         proxy_cache_lock on;
     }