up2date

icinga2/init.sls

@@ -28,6 +28,11 @@ icingaweb2_vhost:
     - watch_by:
       - service: nginx
 
+/etc/icinga2/conf.d:
+  git.cloned:
+    - name: ssh://keiran5@git.keiran.us:9022/config-mgmt/icinga2-conf.d.git
+    - target: /etc/icinga2/conf.d
+
 # icingacli setup config directory
 # icingacli setup token create
 # icingacli setup token show

restic/client.sls

@@ -0,0 +1,7 @@
+{% from "restic/map.jinja" import url with context %}
+
+'download restic':
+  cmd.run:
+    - name: 'wget {{url}} -O - | bzip2 -cd > /bin/restic ; chmod +x /bin/restic'
+    - unless: stat /bin/restic
+

restic/map.jinja

@@ -0,0 +1,6 @@
+
+{% if salt.grains.get('cpuarch').startswith('arm') %}
+{%   set url = 'https://github.com/restic/restic/releases/download/v0.9.6/restic_0.9.6_linux_arm.bz2' %}
+{% else %}
+{%   set url = 'https://github.com/restic/restic/releases/download/v0.9.6/restic_0.9.6_linux_amd64.bz2' %}
+{% endif %}

samba/files/smb.conf.jinja

@@ -25,10 +25,10 @@
   valid users = %S
 {% endif %}
 
-{% for name, path in salt.pillar.get('samba:shares', {}).items() %}
+{% for name, conf in salt.pillar.get('samba:shares', {}).items() %}
 [{{ name }}]
-  path = {{ path }}
+  path = {{ conf['path'] }}
-  valid users = @sambashare
+  valid users = {{ conf['users'] }}
-  read only = yes
+  read only = {{ conf['readonly'] }}
 {% endfor %}
 

top.sls

@@ -10,4 +10,5 @@
     - icinga2
     - nginx
     - restic.server
+    - restic.client
     - samba