summaryrefslogtreecommitdiff
path: root/code/environments/production/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'code/environments/production/manifests')
-rw-r--r--code/environments/production/manifests/site.pp29
1 files changed, 23 insertions, 6 deletions
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,