From c7635458fd89ac7108144ce3669a90f9a83af02b Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 13 Feb 2018 13:49:24 +0100 Subject: site.pp: Drop left-over inheritances. --- code/environments/production/manifests/site.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'code/environments') diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp index da0c84d..91156aa 100644 --- a/code/environments/production/manifests/site.pp +++ b/code/environments/production/manifests/site.pp @@ -140,13 +140,13 @@ node "disklserver.intern" { } } -node "tjener.intern" inherits "all_servers" { +node "tjener.intern" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } class { 'ssh_pubkeys_backupserver': } class { 'itzks_systems_common': } } -node "filter.intern" inherits "all_servers" { +node "filter.intern" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } class { 'ssh_pubkeys_backupserver': } @@ -154,19 +154,19 @@ node "filter.intern" inherits "all_servers" { } # NOT PRESENT node "opsiserver.intern" inherits "all_servers" {} # NOT PRESENT node "displayserver.intern" inherits "all_servers" {} -node "contentserver.intern" inherits "all_servers" { +node "contentserver.intern" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } class { 'ssh_pubkeys_backupserver': } class { 'itzks_systems_common': } } -node "devserver.intern" inherits "all_servers" { +node "devserver.intern" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } class { 'ssh_pubkeys_backupserver': } class { 'itzks_systems_common': } } -node "bibserv.intern" inherits "all_servers" { +node "bibserv.intern" { class { 'ssh_pubkeys_admins': } class { 'ssh_pubkeys_firedadmins': } class { 'ssh_pubkeys_backupserver': } -- cgit v1.2.3