wip

bundles/bind/files/named.conf.local

@@ -7,20 +7,33 @@ acl "${view['name']}" {
 % for view in views:
 view "${view['name']}" {
   match-clients { ${view['name']}; };
+
+  % if view['is_internal']:
   recursion yes;
+  % else:
+  recursion no;
+  rate-limit {
+     responses-per-second 2;
+     window 25;
+  };
+  % endif
+
   forward only;
   forwarders {
     1.1.1.1;
     9.9.9.9;
     8.8.8.8;
   };
+
   % for zone in zones:
   zone "${zone}" {
     type master;
     file "/var/lib/bind/${view['name']}/db.${zone}";
   };
   % endfor
+
   include "/etc/bind/named.conf.default-zones";
   include "/etc/bind/zones.rfc1918";
 };
+
 % endfor

bundles/grafana/items.py

@@ -1,66 +1,3 @@
-c = '''##################### Grafana Configuration Example #####################
-#
-# Everything has defaults so you only need to uncomment things you want to
-# change
-
-# possible values : production, development
-;app_mode = production
-
-# instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
-;instance_name = ${HOSTNAME}
-
-#################################### Paths ####################################
-[paths]
-# Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
-;data = /var/lib/grafana
-
-# Temporary files in `data` directory older than given duration will be removed
-;temp_data_lifetime = 24h
-
-# Directory where grafana can store logs
-;logs = /var/log/grafana
-
-# Directory where grafana will automatically scan and look for plugins
-;plugins = /var/lib/grafana/plugins
-
-# folder that contains provisioning config files that grafana will apply on startup and while running.
-;provisioning = conf/provisioning
-
-#################################### Server ####################################
-[server]
-# Protocol (http, https, h2, socket)
-;protocol = http
-
-# The ip address to bind to, empty will bind to all interfaces
-;http_addr =
-
-# The http port  to use
-;http_port = 3000
-
-# The public facing domain name used to access grafana from a browser
-;domain = localhost
-
-# Redirect to correct domain if host header does not match domain
-# Prevents DNS rebinding attacks
-;enforce_domain = false
-
-# The full public facing url you use in browser, used for redirects and emails
-# If you use reverse proxy and sub path specify full url (with sub path)
-;root_url = %(protocol)s://%(domain)s:%(http_port)s/
-
-# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
-;serve_from_sub_path = false
-
-# Log web requests
-;router_logging = false
-
-# the path relative working path
-;static_root_path = public
-
-# enable gzip
-;enable_gzip = false
-'''
-
 files['/etc/grafana/test'] = {
     'content': repo.libs.ini.dumps(repo.libs.ini.parse(c)),
 }

bundles/influxdb2/items.py

@@ -28,7 +28,7 @@ svc_systemd['influxdb'] = {
 }
 
 actions['wait_for_influxdb_start'] = {
-    'command': 'sleep 5',
+    'command': 'sleep 15',
     'triggered': True,
     'triggered_by': [
         'svc_systemd:influxdb',