Merge "Manage 10periodic and 20auto-upgrades together"

playbooks/roles/base/server/files/20auto-upgrades

@@ -1,2 +0,0 @@
-APT::Periodic::Update-Package-Lists "1";
-APT::Periodic::Unattended-Upgrade "1";

playbooks/roles/base/server/tasks/Debian.yaml

@@ -56,11 +56,15 @@
     src: debian_limits.conf
     dest: /etc/security/limits.d/60-nofile-limit.conf
 
-# TODO combine 10periodic and 20auto-upgrades
+# The next two files share a source file. Different packages manage
+# each of these and we do not want them to get out of sync with each
+# other as that can impact the configuration that apt sees based on
+# priority rules. We address this by making the two files have the same
+# content.
 - name: Install apt-daily 10periodic file for unattended-upgrades
   copy:
      mode: 0444
-     src: 10periodic
+     src: XYperiodic-updates
      dest: /etc/apt/apt.conf.d/10periodic
      owner: root
      group: root
@@ -68,7 +72,7 @@
 - name: Install 20auto-upgrades file for unattended-upgrades
   copy:
      mode: 0444
-     src: 20auto-upgrades
+     src: XYperiodic-updates
      dest: /etc/apt/apt.conf.d/20auto-upgrades
      owner: root
      group: root

testinfra/test_base.py

@@ -99,8 +99,12 @@ def test_unattended_upgrades(host):
 
         cfg_file = host.file("/etc/apt/apt.conf.d/20auto-upgrades")
         assert cfg_file.exists
+        assert cfg_file.contains('^APT::Periodic::Enable "1"')
         assert cfg_file.contains('^APT::Periodic::Update-Package-Lists "1"')
+        assert cfg_file.contains('^APT::Periodic::Download-Upgradeable-Packages "1"')
+        assert cfg_file.contains('^APT::Periodic::AutocleanInterval "5"')
         assert cfg_file.contains('^APT::Periodic::Unattended-Upgrade "1"')
+        assert cfg_file.contains('^APT::Periodic::RandomSleep "1800"')
 
         cfg_file = host.file("/etc/apt/apt.conf.d/50unattended-upgrades")
         assert cfg_file.contains('^Unattended-Upgrade::Mail "root"')