From 23f62e7088b12072a63241ca90fb78fa330e5e09 Mon Sep 17 00:00:00 2001
From: edunham <edunham@mozilla.com>
Date: Thu, 24 Mar 2016 16:51:56 -0700
Subject: [PATCH 1/2] Set unattended-upgrades on Ubuntu hosts

Not sure if this is the best way, but
http://blog.viraptor.info/post/75262988169/ubuntu-unattended-upgrades-the-salt-way
suggests it.

Fixes https://github.com/servo/saltfs/issues/275
---
 common/init.sls | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/common/init.sls b/common/init.sls
index e1ce6f2d..6f1d8bd1 100644
--- a/common/init.sls
+++ b/common/init.sls
@@ -10,6 +10,20 @@ python2-dev:
   pkg.installed:
     - pkgs:
       - python-dev
+
+unattended-upgrades:
+  debconf.set:
+    - data:
+        'unattended-upgrades/enable_auto_updates':
+          type: boolean
+          value: "true"
+  cmd.wait:
+    - name: "dpkg-reconfigure unattended-upgrades"
+    - watch:
+      - debconf: unattended-upgrades
+    - env:
+        DEBIAN_FRONTEND: noninteractive
+        DEBCONF_NONINTERACTIVE_SEEN: "true"
 {% endif %}
 
 pip:

From ea4c50caecd38b62a6322b4e094f236c194a0c44 Mon Sep 17 00:00:00 2001
From: edunham <edunham@mozilla.com>
Date: Fri, 25 Mar 2016 10:41:23 -0700
Subject: [PATCH 2/2] Install unattended upgrades package and track
 auto-upgrades file

---
 common/files/20auto-upgrades |  2 ++
 common/init.sls              | 16 ++++++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 common/files/20auto-upgrades

diff --git a/common/files/20auto-upgrades b/common/files/20auto-upgrades
new file mode 100644
index 00000000..8d6d7c82
--- /dev/null
+++ b/common/files/20auto-upgrades
@@ -0,0 +1,2 @@
+APT::Periodic::Update-Package-Lists "1";
+APT::Periodic::Unattended-Upgrade "1";
diff --git a/common/init.sls b/common/init.sls
index 6f1d8bd1..391e5032 100644
--- a/common/init.sls
+++ b/common/init.sls
@@ -6,10 +6,11 @@ python2:
       - python
 
 {% if grains['os'] == 'Ubuntu' %}
-python2-dev:
+ubuntu-packages:
   pkg.installed:
     - pkgs:
       - python-dev
+      - unattended-upgrades
 
 unattended-upgrades:
   debconf.set:
@@ -17,13 +18,12 @@ unattended-upgrades:
         'unattended-upgrades/enable_auto_updates':
           type: boolean
           value: "true"
-  cmd.wait:
-    - name: "dpkg-reconfigure unattended-upgrades"
-    - watch:
-      - debconf: unattended-upgrades
-    - env:
-        DEBIAN_FRONTEND: noninteractive
-        DEBCONF_NONINTERACTIVE_SEEN: "true"
+  file.managed:
+    - name: /etc/apt/apt.conf.d/20auto-upgrades
+    - source: salt://{{ tpldir }}/files/20auto-upgrades
+    - user: root
+    - group: root
+    - mode: 644
 {% endif %}
 
 pip: