summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-09-26 11:18:14 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-09-26 11:18:14 +0200
commit6e514db0e3490a60ad6782027bc36b4061cf978d (patch)
tree5d17861a25cf6abe0f029b5c733ae41ae1679ef2
parentf28763d453abb5b135b65a9f695d417a886ef720 (diff)
downloadpuppet.FWSECK-6e514db0e3490a60ad6782027bc36b4061cf978d.tar.gz
puppet.FWSECK-6e514db0e3490a60ad6782027bc36b4061cf978d.tar.bz2
puppet.FWSECK-6e514db0e3490a60ad6782027bc36b4061cf978d.zip
site.pp: Keep web browser and Flashplayer add-ons up-to-date via Puppet.
-rw-r--r--code/environments/production/manifests/site.pp39
1 files changed, 31 insertions, 8 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 9559506..d0ff2e9 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -70,6 +70,29 @@ class login_manager {
}
}
+class browsers {
+ package { firefox-esr:
+ ensure => 'latest',
+ }
+ package { chromium:
+ ensure => 'latest',
+ }
+ $flashplayer_mozilla_package = $::operatingsystemrelease ? {
+ /(?i:8\..*)/ => 'hello',
+ default => 'flashplayer-mozilla',
+ }
+ package { $flashplayer_mozilla_package:
+ ensure => 'latest',
+ }
+ $flashplayer_chromium_package = $::operatingsystemrelease ? {
+ /(?i:8\..*)/ => 'hello',
+ default => 'flashplayer-chromium',
+ }
+ package { $flashplayer_chromium_package:
+ ensure => 'latest',
+ }
+}
+
class itzks_systems_common {
package { 'itzks-systems-common':
ensure => 'latest',
@@ -170,6 +193,7 @@ node "filter.intern" {
debdelta => 1,
},
}
+ class { 'browsers': }
}
# NOT PRESENT node "opsiserver.intern" inherits "all_servers" {}
# NOT PRESENT node "displayserver.intern" inherits "all_servers" {}
@@ -185,7 +209,8 @@ node /workstation-.*\.intern$/ {
class { 'login_manager': }
class { 'itzks_systems_common': }
class { 'itzks_systems_workstation': }
-
+ class { 'fsautoresizetab': }
+ class { 'fsautoresizetab_change_usr': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,
@@ -197,9 +222,7 @@ node /workstation-.*\.intern$/ {
debdelta => 1,
},
}
-
- class { 'fsautoresizetab': }
- class { 'fsautoresizetab_change_usr': }
+ class { 'browsers': }
}
# Notebooks
@@ -212,7 +235,8 @@ node /notebook-.*\.intern$/ {
class { 'login_manager': }
class { 'itzks_systems_common': }
class { 'itzks_systems_workstation': }
-
+ class { 'fsautoresizetab': }
+ class { 'fsautoresizetab_change_usr': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,
@@ -224,9 +248,7 @@ node /notebook-.*\.intern$/ {
debdelta => 1,
},
}
-
- class { 'fsautoresizetab': }
- class { 'fsautoresizetab_change_usr': }
+ class { 'browsers': }
}
# default / minimal
@@ -244,4 +266,5 @@ node "default" {
debdelta => 1,
},
}
+ class { 'browsers': }
}