summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schlüter <bschlueter@posteo.de>2018-12-11 15:53:24 +0100
committerBenjamin Schlüter <bschlueter@posteo.de>2018-12-11 15:53:24 +0100
commita306440cd79c68d88379b98efdb943269bed324a (patch)
tree580d099f0e585da6e272dd8d0a5ec1240dd022d5
parent998b8fce9b80fce5b13642a04362b379f052652e (diff)
downloadpuppet.FWSECK-a306440cd79c68d88379b98efdb943269bed324a.tar.gz
puppet.FWSECK-a306440cd79c68d88379b98efdb943269bed324a.tar.bz2
puppet.FWSECK-a306440cd79c68d88379b98efdb943269bed324a.zip
Add class lsb_release_with_version.
-rw-r--r--code/environments/production/manifests/site.pp31
1 files changed, 30 insertions, 1 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 1d1c43b..d6d3545 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -53,6 +53,17 @@ class ssh_pubkeys_firedadmins {
# }
#}
+class lsb_release_with_version {
+ file { '/etc/lsb-release':
+ ensure => present,
+ }
+ file_line { 'lsb-release-with-version':
+ path => '/etc/lsb-release',
+ line => "DISTRIB_DESCRIPTION=Debian Edu / Skolelinux ${::operatingsystemrelease}",
+ match => "^DISTRIB_DESCRIPTION=DebianEdu/Skolelinux$",
+ }
+}
+
class anacron_on_battery {
file_line { 'anacron-on-battery':
path => '/etc/default/anacron',
@@ -150,6 +161,20 @@ class fsautoresizetab_change_usr {
}
}
+#node "all_hosts" {
+# class { 'ssh_pubkeys_admins': }
+# class { 'ssh_pubkeys_firedadmins': }
+# class { 'lsb_release_with_version': }
+# class { 'login_manager': }
+#}
+
+#node "all_servers" {
+# class { 'ssh_pubkeys_admins': }
+# class { 'ssh_pubkeys_firedadmins': }
+# class { 'ssh_pubkeys_backupserver': }
+# class { 'lsb_release_with_version': }
+#}
+
node "tjener.intern" {
class { 'ssh_pubkeys_admins': }
@@ -159,7 +184,7 @@ node "tjener.intern" {
class { 'itzks_systems_mainserver': }
class { 'itzks_systems_terminalserver': }
-
+ class { 'lsb_release_with_version': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,
@@ -182,6 +207,7 @@ node "filter.intern" {
# class { 'ssh_pubkeys_backupserver': }
class { 'itzks_systems_common': }
class { 'itzks_systems_filter': }
+ class { 'lsb_release_with_version': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,
@@ -212,6 +238,7 @@ node /workstation-.*\.intern$/ {
class { 'itzks_systems_workstation': }
class { 'fsautoresizetab': }
class { 'fsautoresizetab_change_usr': }
+ class { 'lsb_release_with_version': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,
@@ -238,6 +265,7 @@ node /notebook-.*\.intern$/ {
class { 'itzks_systems_workstation': }
class { 'fsautoresizetab': }
class { 'fsautoresizetab_change_usr': }
+ class { 'lsb_release_with_version': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,
@@ -256,6 +284,7 @@ node /notebook-.*\.intern$/ {
node "default" {
class { 'ssh_pubkeys_admins': }
class { 'ssh_pubkeys_firedadmins': }
+ class { 'lsb_release_with_version': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,