From 74e0ff5ff3f7c7b8d828174b415c746ca4923862 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 25 Jun 2018 11:20:06 +0200
Subject: [PATCH] Unified environments for customer pixelpark-dns

---
 customer/pixelpark-dns/common.yaml                  | 5 +++++
 customer/pixelpark-dns/development.yaml             | 8 ++++----
 customer/pixelpark-dns/ns1-local.pixelpark.com.yaml | 2 --
 customer/pixelpark-dns/production.yaml              | 5 -----
 customer/pixelpark-dns/test.yaml                    | 8 ++++----
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/customer/pixelpark-dns/common.yaml b/customer/pixelpark-dns/common.yaml
index 0a3ff3c6..7bd28d20 100644
--- 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 0226ce6c..4da97a85 100644
--- 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 498fe8be..0cef1513 100644
--- 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 49ff5431..4fe3cc40 100644
--- 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 0226ce6c..4da97a85 100644
--- 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
-- 
2.39.5