From 14c60093cb2610575515abe09de1777df885161c Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 14 Apr 2018 23:50:55 +0200
Subject: [PATCH] upstream.ipv6-tunnel: fix ipv6-tunnel-update.sh for upstream2

---
 salt-pillar/upstream/upstream2.sls |  2 ++
 salt/upstream/ipv6-tunnel.sls      | 21 ++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/salt-pillar/upstream/upstream2.sls b/salt-pillar/upstream/upstream2.sls
index 48dbe93..5785047 100644
--- a/salt-pillar/upstream/upstream2.sls
+++ b/salt-pillar/upstream/upstream2.sls
@@ -1,3 +1,5 @@
+#!yaml|gpg
+
 upstream:
   interface: up2
   nat66-interface: up2
diff --git a/salt/upstream/ipv6-tunnel.sls b/salt/upstream/ipv6-tunnel.sls
index 0b38368..8b94b61 100644
--- a/salt/upstream/ipv6-tunnel.sls
+++ b/salt/upstream/ipv6-tunnel.sls
@@ -30,8 +30,8 @@ curl:
         [Network]
         Tunnel=ipv6
 
-{%- if pillar['ipv6-tunnel'].get('tunnelbroker') -%}
-/etc/cron.hourly/ipv6-tunnel-update.sh
+{% if pillar['ipv6-tunnel'].get('tunnelbroker') %}
+/etc/cron.hourly/ipv6-tunnel-update.sh:
   file.managed:
     - source: salt://upstream/ipv6-tunnel-update.sh
     - template: 'jinja'
@@ -41,18 +41,17 @@ curl:
         - pkg: curl
 
 cron:
-  service:
-    - enabled
-    - running
+  service.running:
+    - enable: True
+    - reload: True
     - watch:
         - file: /etc/cron.hourly/ipv6-tunnel-update.sh
-{%- endif -%}
+{% endif %}
 
-systemd-networkd:
-  service:
-    - enabled
-    - running
-    - watch:
+autostart-systemd-networkd:
+  service.running:
+    - name: systemd-networkd
+      watch:
         - file: /etc/systemd/network/ipv6.netdev
         - file: /etc/systemd/network/ipv6.network
         - file: /etc/systemd/network/ipv6-up.network