summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-09-20 14:57:42 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-09-20 14:57:42 +0200
commit4657822c9876c99df037970adba9c50f84bc2032 (patch)
treef1ecd9912369842216a8f90391c37698dab711a7
parent91520d4d5b20f3dd3d3a48ada0a54ec49152a610 (diff)
downloadpuppet.WDORF-4657822c9876c99df037970adba9c50f84bc2032.zip
puppet.WDORF-4657822c9876c99df037970adba9c50f84bc2032.tar.gz
puppet.WDORF-4657822c9876c99df037970adba9c50f84bc2032.tar.bz2
site.pp: Move filter.intern below tjener.intern.
-rw-r--r--code/environments/production/manifests/site.pp18
1 files changed, 9 insertions, 9 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 9dcc1b4..ec38887 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -180,20 +180,19 @@ node "disklserver.intern" {
},
}
}
-
-node "filter.intern" {
+node "tjener.intern" {
class { 'ssh_pubkeys_admins': }
class { 'ssh_pubkeys_firedadmins': }
class { 'ssh_pubkeys_backupserver': }
- class { 'fsautoresizetab': }
class { 'itzks_systems_common': }
- class { 'itzks_systems_filter': }
+ class { 'itzks_systems_mainserver': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,
+ age => { 'max' => 10 },
auto => {
'clean' => 7,
- 'reboot' => true,
+ ### WE DON'T REBOOT TJENER
},
upgradeable_packages => {
download_only => 1,
@@ -202,19 +201,19 @@ node "filter.intern" {
}
}
-node "tjener.intern" {
+node "filter.intern" {
class { 'ssh_pubkeys_admins': }
class { 'ssh_pubkeys_firedadmins': }
class { 'ssh_pubkeys_backupserver': }
+ class { 'fsautoresizetab': }
class { 'itzks_systems_common': }
- class { 'itzks_systems_mainserver': }
+ class { 'itzks_systems_filter': }
class { 'unattended_upgrades':
enable => 1,
origins => $apt_origins,
- age => { 'max' => 10 },
auto => {
'clean' => 7,
- ### WE DON'T REBOOT TJENER
+ 'reboot' => true,
},
upgradeable_packages => {
download_only => 1,
@@ -222,6 +221,7 @@ node "tjener.intern" {
},
}
}
+
# NOT USED node "displayserver.intern" inherits "all_servers" {}
# Notebooks