diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-09-20 15:16:21 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-09-20 15:16:21 +0200 |
commit | 13a1414d85826f17eeab405a11689129c04a38a4 (patch) | |
tree | 5b844a5c629b5abb8c6200a9082891d6b708a1e3 | |
parent | 6162b571d3dea04957ba6712a4191b83c8fb2c89 (diff) | |
download | puppet.FWSECK-13a1414d85826f17eeab405a11689129c04a38a4.tar.gz puppet.FWSECK-13a1414d85826f17eeab405a11689129c04a38a4.tar.bz2 puppet.FWSECK-13a1414d85826f17eeab405a11689129c04a38a4.zip |
site.pp: Bring back unattended-upgrades support to puppet 4.8.x.
-rw-r--r-- | code/environments/production/manifests/site.pp | 92 |
1 files changed, 54 insertions, 38 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp index 919d9d3..2316c0b 100644 --- a/code/environments/production/manifests/site.pp +++ b/code/environments/production/manifests/site.pp @@ -1,5 +1,12 @@ #include apt +$apt_origins = [ + 'origin=Debian,n=${distro_codename}', + 'origin=Debian,n=${distro_codename}-updates', + 'origin=Debian,n=${distro_codename},l=Debian-Security', + 'origin=IT-Zukunft Schule,n=${distro_codename},l=IT-Zukunft Schule', +] + class ssh_pubkeys_admins { # Mike Gabriel, IT-Zukunft Schule ssh_authorized_key { 'mike@minobo': @@ -117,6 +124,20 @@ node "tjener.intern" { class { 'itzks_systems_mainserver': } class { 'itzks_systems_terminalserver': } + + class { 'unattended_upgrades': + enable => 1, + origins => $apt_origins, + age => { 'max' => 10 }, + auto => { + 'clean' => 7, + ### WE DON'T REBOOT TJENER + }, + upgradeable_packages => { + download_only => 1, + debdelta => 1, + }, + } } # NOT PRESENT node "filter.intern" inherits "all_servers" {} # NOT PRESENT node "opsiserver.intern" inherits "all_servers" {} @@ -134,25 +155,17 @@ node /workstation-.*\.intern$/ { class { 'itzks_systems_common': } class { 'itzks_systems_workstation': } -# # settings appropriate for workstation hosts -# class { 'apt::unattended_upgrades': -# origins => [ -# 'o=Debian,n=${distro_codename}', -# 'o=Debian,n=${distro_codename}-updates', -# 'o=Debian,n=${distro_codename},l=Debian-Security', -# 'o=IT-Zukunft Schule,n=${distro_codename},l=IT-Zukunft Schule', -# ], -# update => "1", -# download => "1", -# upgrade => "1", -# autoclean => "7", -# auto_fix => true, -# minimal_steps => true, -# install_on_shutdown => false, -# remove_unused => true, -# auto_reboot => false, -# download_delta => "1", -# } + class { 'unattended_upgrades': + enable => 1, + origins => $apt_origins, + auto => { + 'clean' => 7, + }, + upgradeable_packages => { + download_only => 1, + debdelta => 1, + }, + } class { 'fsautoresizetab': } class { 'fsautoresizetab_change_usr': } @@ -169,25 +182,17 @@ node /notebook-.*\.intern$/ { class { 'itzks_systems_common': } class { 'itzks_systems_workstation': } -# # settings appropriate for workstation hosts -# class { 'apt::unattended_upgrades': -# origins => [ -# 'o=Debian,n=${distro_codename}', -# 'o=Debian,n=${distro_codename}-updates', -# 'o=Debian,n=${distro_codename},l=Debian-Security', -# 'o=IT-Zukunft Schule,n=${distro_codename},l=IT-Zukunft Schule', -# ], -# update => "1", -# download => "1", -# upgrade => "1", -# autoclean => "7", -# auto_fix => true, -# minimal_steps => true, -# install_on_shutdown => false, -# remove_unused => true, -# auto_reboot => false, -# download_delta => "1", -# } + class { 'unattended_upgrades': + enable => 1, + origins => $apt_origins, + auto => { + 'clean' => 7, + }, + upgradeable_packages => { + download_only => 1, + debdelta => 1, + }, + } class { 'fsautoresizetab': } class { 'fsautoresizetab_change_usr': } @@ -197,4 +202,15 @@ node /notebook-.*\.intern$/ { node "default" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } + class { 'unattended_upgrades': + enable => 1, + origins => $apt_origins, + auto => { + 'clean' => 7, + }, + upgradeable_packages => { + download_only => 1, + debdelta => 1, + }, + } } |