summaryrefslogtreecommitdiff
path: root/code/environments/production/manifests
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-02-13 13:49:24 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-02-13 13:49:24 +0100
commitc7635458fd89ac7108144ce3669a90f9a83af02b (patch)
tree6eba71734a069c2cb07cc1e674fabfe020225d02 /code/environments/production/manifests
parent861312a7c91faf1dc54e49891396865c3c91eb5d (diff)
downloadpuppet.KATH-c7635458fd89ac7108144ce3669a90f9a83af02b.tar.gz
puppet.KATH-c7635458fd89ac7108144ce3669a90f9a83af02b.tar.bz2
puppet.KATH-c7635458fd89ac7108144ce3669a90f9a83af02b.zip
site.pp: Drop left-over inheritances.
Diffstat (limited to 'code/environments/production/manifests')
-rw-r--r--code/environments/production/manifests/site.pp10
1 files changed, 5 insertions, 5 deletions
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': }