Browse Source

dhcp-server: Clean up white spaces in templates

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm 3 weeks ago
parent
commit
9f31c06285
2 changed files with 11 additions and 8 deletions
  1. 10 7
      dhcp-server/dhcpd.conf
  2. 1 1
      dhcp-server/dhcpd.default

+ 10 - 7
dhcp-server/dhcpd.conf

@@ -1,7 +1,8 @@
+{%- set dhcp_prefixes = salt['pillar.get']("nodes:" ~ grains["id"] ~ ":dhcp:server:prefixes", []) -%}
 #
 # Gateway DHCP server configuration (Salt managed)
 #
-{%- set dhcp_prefixes = salt['pillar.get']("nodes:" ~ grains["id"] ~ ":dhcp:server:prefixes", []) %}
+
 # The ddns-updates-style parameter controls whether or not the server will
 # attempt to do a DNS update when a lease is confirmed. We default to the
 # behavior of the version 2 packages ('none', since DHCP v2 didn't
@@ -21,14 +22,16 @@ subnet {{ prefix["network"] }} netmask {{ prefix["netmask"] }} {
 	pool {
 		# monitor: 75% 90% Y {{ grains['nodename'] }}/{{ prefix["description"] }} DHCP pool
 
+		# Use our own IP as gateway for our clients
 		option routers {{ prefix["routers"] }};
-
-  {%- if "ranges" in prefix %}
-    {%- for range in prefix["ranges"] %}
+{%   if "ranges" in prefix %}
+		# Range(s) of IPs to lease to clients
+{%-     for range in prefix["ranges"] %}
 		range {{ range }};
-    {%- endfor %}
-  {%- endif %}
+{%-     endfor %}
+{%-   else %}
+		# No ranges defined, static leases only?
+{%-   endif %}
 	}
 }
-
 {% endfor %}

+ 1 - 1
dhcp-server/dhcpd.default

@@ -1,4 +1,4 @@
-{%- set dhcp_interfaces = salt['pillar.get']("nodes:" ~ grains["id"] ~ ":dhcp:server:ifaces", []) %}
+{%- set dhcp_interfaces = salt['pillar.get']("nodes:" ~ grains["id"] ~ ":dhcp:server:ifaces", []) -%}
 # Defaults for isc-dhcp-server (sourced by /etc/init.d/isc-dhcp-server) (Salt managed)
 
 # Path to dhcpd's config file (default: /etc/dhcp/dhcpd.conf).