summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-09-20 14:57:12 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-09-20 14:57:12 +0200
commit91520d4d5b20f3dd3d3a48ada0a54ec49152a610 (patch)
tree89fea458c8c83a5ac5e5486d733b3e44026d748a
parente8ea1687887da18b287a6bb9b34670619e8692e1 (diff)
downloadpuppet.WDORF-91520d4d5b20f3dd3d3a48ada0a54ec49152a610.zip
puppet.WDORF-91520d4d5b20f3dd3d3a48ada0a54ec49152a610.tar.gz
puppet.WDORF-91520d4d5b20f3dd3d3a48ada0a54ec49152a610.tar.bz2
site.pp: Bring back unattended-upgrades support to puppet 4.8.x.
-rw-r--r--code/environments/production/manifests/site.pp56
1 files changed, 56 insertions, 0 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 7aed4e7..9dcc1b4 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':
@@ -159,6 +166,19 @@ node "disklserver.intern" {
key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQDiLGbx/U9slB9db8PAy8FTRo7/avVvLJUOZzkoBxZa5Edeo+74ezoU2Kv1OxcRJRnSGBe41XDcpLxDS04JMA5xBddUfdq5c+Y1A2SYChUPK1fkrGoKfmGC60dFmEqAQZ33dJhN9rxzQvuvxlmexX8x2TYJC8/jATa+6QuO4chHAFvGo9RLs8hzet5y06fammJDkf0yD6R32GT7q4XMNXilKQ564D1yBJygE6vZx/W3V3l8/QMr6m1lYTTk+W+29IkoxvQBZ6YXKFdnuTVkSYyanafjZwznTFSuBtBZKcgLXFFmyplcB4QlZGvdrrsEJazwwj+pnJeGx0HwV8ePbKxN',
user => 'root',
}
+
+ class { 'unattended_upgrades':
+ enable => 1,
+ origins => $apt_origins,
+ auto => {
+ 'clean' => 7,
+ 'reboot' => true,
+ },
+ upgradeable_packages => {
+ download_only => 1,
+ debdelta => 1,
+ },
+ }
}
node "filter.intern" {
@@ -168,6 +188,18 @@ node "filter.intern" {
class { 'fsautoresizetab': }
class { 'itzks_systems_common': }
class { 'itzks_systems_filter': }
+ class { 'unattended_upgrades':
+ enable => 1,
+ origins => $apt_origins,
+ auto => {
+ 'clean' => 7,
+ 'reboot' => true,
+ },
+ upgradeable_packages => {
+ download_only => 1,
+ debdelta => 1,
+ },
+ }
}
node "tjener.intern" {
@@ -176,6 +208,19 @@ node "tjener.intern" {
class { 'ssh_pubkeys_backupserver': }
class { 'itzks_systems_common': }
class { 'itzks_systems_mainserver': }
+ 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 USED node "displayserver.intern" inherits "all_servers" {}
@@ -191,6 +236,17 @@ node /notebook.*\.intern$/ {
class { 'fsautoresizetab_change_root_fs': }
class { 'itzks_systems_common': }
class { 'itzks_systems_workstation': }
+ class { 'unattended_upgrades':
+ enable => 1,
+ origins => $apt_origins,
+ auto => {
+ 'clean' => 7,
+ },
+ upgradeable_packages => {
+ download_only => 1,
+ debdelta => 1,
+ },
+ }
}
# default / minimal