Unified environments for customer pixelpark-dns

diff --git a/customer/pixelpark-dns/common.yaml b/customer/pixelpark-dns/common.yaml
index 0a3ff3c665a14f95c07ad66df2d108d97849bdea..7bd28d2006c861a3815eca5a324a6fab0f752578 100644 (file)
--- a/customer/pixelpark-dns/common.yaml
+++ b/customer/pixelpark-dns/common.yaml
@@ -3,10 +3,15 @@ infra::role: base
 infra::additional_classes:
   - infra::profile::postfix
   - infra::profile::cron
+  - rsyslog::client
+  - infra::profile::logrotate
+  - resolv_conf
 
 postfix::myorigin: "pixelpark.com"
 infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient-hostmaster'
 
+infra::profile::ntp::disable_ntp: true
+
 #####################################################
 # Logrotation
 

diff --git a/customer/pixelpark-dns/development.yaml b/customer/pixelpark-dns/development.yaml
index 0226ce6c66b7ff3da2b3b7478a63c420a40010c7..4da97a85e59976197e1db62e18b6fe674416b054 100644 (file)
--- a/customer/pixelpark-dns/development.yaml
+++ b/customer/pixelpark-dns/development.yaml
@@ -1,8 +1,8 @@
 ---
 
-infra::additional_classes:
-  - rsyslog::client
-  - infra::profile::logrotate
-  - resolv_conf
+#infra::additional_classes:
+#  - rsyslog::client
+#  - infra::profile::logrotate
+#  - resolv_conf
 
 # vim: et list

diff --git a/customer/pixelpark-dns/ns1-local.pixelpark.com.yaml b/customer/pixelpark-dns/ns1-local.pixelpark.com.yaml
index 498fe8be69f4551a7e973e9c886d66f2fe93df9b..0cef1513a3aab6c258a055f19c7b70c3ee471515 100644 (file)
--- a/customer/pixelpark-dns/ns1-local.pixelpark.com.yaml
+++ b/customer/pixelpark-dns/ns1-local.pixelpark.com.yaml
@@ -7,8 +7,6 @@ infra::additional_classes:
 # Necessary, because the host has a local caching only DNS resolver
 #puppetconf::server: puppetmaster01.pixelpark.com
 
-infra::profile::ntp::disable_ntp: true
-
 bind::local_recursor: true
 
 bind::deploy::environment: 'local'

diff --git a/customer/pixelpark-dns/production.yaml b/customer/pixelpark-dns/production.yaml
index 49ff54312c4f3dd9e9338608105280f7d41994b4..4fe3cc406188d4524f129685855950841b37745a 100644 (file)
--- a/customer/pixelpark-dns/production.yaml
+++ b/customer/pixelpark-dns/production.yaml
@@ -1,9 +1,4 @@
 ---
 
-infra::additional_classes:
-  - rsyslog::client
-  - infra::profile::logrotate
-  - resolv_conf
-
 # vim: et list
 

diff --git a/customer/pixelpark-dns/test.yaml b/customer/pixelpark-dns/test.yaml
index 0226ce6c66b7ff3da2b3b7478a63c420a40010c7..4da97a85e59976197e1db62e18b6fe674416b054 100644 (file)
--- a/customer/pixelpark-dns/test.yaml
+++ b/customer/pixelpark-dns/test.yaml
@@ -1,8 +1,8 @@
 ---
 
-infra::additional_classes:
-  - rsyslog::client
-  - infra::profile::logrotate
-  - resolv_conf
+#infra::additional_classes:
+#  - rsyslog::client
+#  - infra::profile::logrotate
+#  - resolv_conf
 
 # vim: et list