summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schlüter <bschlueter@posteo.de>2018-12-11 15:59:39 +0100
committerBenjamin Schlüter <bschlueter@posteo.de>2018-12-11 15:59:39 +0100
commit3f8e55c94f856a0b8ab755ef1b34cb7d2f363acd (patch)
tree4bccdf394465010fdcdcb019336d7f0a8528f830
parent4a38336adfaadb13522e728b350095786ae8be8e (diff)
downloadpuppet.WDORF-3f8e55c94f856a0b8ab755ef1b34cb7d2f363acd.tar.gz
puppet.WDORF-3f8e55c94f856a0b8ab755ef1b34cb7d2f363acd.tar.bz2
puppet.WDORF-3f8e55c94f856a0b8ab755ef1b34cb7d2f363acd.zip
Add class lsb_release_with_version.
-rw-r--r--code/environments/production/manifests/site.pp18
1 files changed, 18 insertions, 0 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index e47f32b..108c6b0 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -45,6 +45,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 ssh_pubkeys_backupserver {
ssh_authorized_key { 'root@backup-01':
type => 'ssh-rsa',
@@ -165,6 +176,7 @@ class fsautoresizetab_change_root_fs {
# class { 'fsautoresizetab': }
# class { 'fsautoresizetab_change_usr': }
# class { 'fsautoresizetab_change_var': }
+# class { 'lsb_release_with_version': }
# class { 'itzks_systems_common': }
#}
@@ -173,6 +185,7 @@ class fsautoresizetab_change_root_fs {
# class { 'ssh_pubkeys_firedadmins': }
# class { 'ssh_pubkeys_backupserver': }
# class { 'fsautoresizetab': }
+# class { 'lsb_release_with_version': }
# class { 'itzks_systems_common': }
#}
@@ -182,6 +195,7 @@ node "disklserver.intern" {
class { 'ssh_pubkeys_backupserver': }
class { 'itzks_systems_common': }
class { 'itzks_systems_disklserver': }
+ class { 'lsb_release_with_version': }
# vidar.das-netzwerkteam.de is the deployment source for diskless workstation chroots
ssh_authorized_key { 'root@vidar.das-netzwerkteam.de':
@@ -209,6 +223,7 @@ node "tjener.intern" {
class { 'ssh_pubkeys_backupserver': }
class { 'itzks_systems_common': }
class { 'itzks_systems_mainserver': }
+ class { 'lsb_release_with_version': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,
@@ -231,6 +246,7 @@ node "filter.intern" {
class { 'fsautoresizetab': }
class { 'itzks_systems_common': }
class { 'itzks_systems_filter': }
+ class { 'lsb_release_with_version': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,
@@ -259,6 +275,7 @@ node /notebook.*\.intern$/ {
class { 'fsautoresizetab_change_root_fs': }
class { 'itzks_systems_common': }
class { 'itzks_systems_workstation': }
+ class { 'lsb_release_with_version': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,
@@ -277,6 +294,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,