From 20f50037e6941b2225816f4b5b201869c7d679c9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 11 Dec 2018 13:10:29 +0100 Subject: add class 'lsb_release_with_version' --- code/environments/production/manifests/site.pp | 29 ++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'code') diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp index c21830e..03c2b2e 100644 --- a/code/environments/production/manifests/site.pp +++ b/code/environments/production/manifests/site.pp @@ -7,7 +7,6 @@ $apt_origins = [ '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': @@ -54,6 +53,17 @@ class ssh_pubkeys_backupserver { } } +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=.*$", + } +} + class login_manager { package { 'arctica-greeter': ensure => 'installed', @@ -89,19 +99,22 @@ class browsers { #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': } -} +#node "all_servers" { +# class { 'ssh_pubkeys_admins': } +# class { 'ssh_pubkeys_firedadmins': } +# class { 'ssh_pubkeys_backupserver': } +# class { 'lsb_release_with_version': } +#} node "disklserver.intern" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } class { 'ssh_pubkeys_backupserver': } + 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': type => 'ssh-rsa', @@ -126,6 +139,7 @@ node "tjener.intern" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } class { 'ssh_pubkeys_backupserver': } + class { 'lsb_release_with_version': } class { 'unattended_upgrades': enable => 1, origins => $apt_origins, @@ -145,6 +159,7 @@ node "filter.intern" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } class { 'ssh_pubkeys_backupserver': } + class { 'lsb_release_with_version': } class { 'unattended_upgrades': enable => 1, origins => $apt_origins, @@ -164,6 +179,7 @@ node "opsiserver.intern" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } class { 'ssh_pubkeys_backupserver': } + class { 'lsb_release_with_version': } class { 'unattended_upgrades': enable => 1, origins => $apt_origins, @@ -185,6 +201,7 @@ node "opsiserver.intern" { node "default" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } + class { 'lsb_release_with_version': } class { 'unattended_upgrades': enable => 1, origins => $apt_origins, -- cgit v1.2.3