burp: Move server specific configuration into sub-directory

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>

burp/server.sls

@@ -15,13 +15,13 @@ burp-server:
 
 /etc/default/burp:
   file.managed:
-    - source: salt://burp/default_burp
+    - source: salt://burp/server/default_burp
     - watch_in:
       - service: burp-server
 
 /etc/burp/burp-server.conf:
   file.managed:
-    - source: salt://burp/burp-server.conf.tmpl
+    - source: salt://burp/server/burp-server.conf.tmpl
     - template: jinja
     - watch_in:
       - service: burp-server
@@ -37,7 +37,7 @@ burp-server:
 
 /etc/burp/clientconfdir/incexc/common:
   file.managed:
-    - source: salt://burp/client_common_incexc
+    - source: salt://burp/server/common_incexc
     - require:
       - file: /etc/burp/clientconfdir/incexc
     - watch_in:
@@ -47,7 +47,7 @@ burp-server:
 {% for node, node_config in nodes.items()|sort if 'burp' in node_config %}
 /etc/burp/clientconfdir/{{ node }}:
   file.managed:
-    - source: salt://burp/client.tmpl
+    - source: salt://burp/server/client.tmpl
     - template: jinja
     - context:
       node: {{ node }}

burp/client.tmpl → burp/server/client.tmpl

@@ -3,6 +3,8 @@
 #
 password = {{ burp_config.get ('password') }}
 
+. incexc/common
+
 {%- for entry in burp_config.get ('include_fs') %}
 include = {{ entry }}
 {%- endfor %}

burp/server/common_incexc

@@ -0,0 +1,40 @@
+#
+# Common options for all clients (Salt managed)
+#
+
+# If you add at least one 'include=' line, the server will override the
+# rest of the client options below, which define exactly what to backup.
+# Setting any of the other options here will then also take effect on the
+# client.
+
+include = /etc
+include = /srv
+
+# Exclude various temporary file systems.
+exclude_fs = sysfs
+exclude_fs = tmpfs
+exclude_fs = proc
+exclude_fs = devfs
+exclude_fs = devpts
+
+# exclude_ext=vdi
+# exclude_regex=/\.cache/
+
+# Exclude files from compression by extension.
+exclude_comp = bz2
+exclude_comp = gz
+exclude_comp = xz
+
+# cross_filesystem=/some/path
+cross_all_filesystems=0
+
+# split_vss=1
+# strip_vss=0
+
+# When backing up, whether to enable O_NOATIME when opening files and
+# directories. The default is atime=0, which enables O_NOATIME.
+atime = 0
+
+# When enabled, this causes problems in the phase1 scan (such as an 'include'
+# being missing) to be treated as fatal errors. The default is 0.
+scan_problem_raises_error = 0