Adding logstash to dnsmaster02.pixelpark.net

diff --git a/customer/pixelpark-dns/dnsmaster02.pixelpark.com.yaml b/customer/pixelpark-dns/dnsmaster02.pixelpark.com.yaml
index 2392bd8f22dc492d24359d906c004094e264254f..7fa56589f2eddaf4c5528555b7f4fd260f882384 100644 (file)
--- a/customer/pixelpark-dns/dnsmaster02.pixelpark.com.yaml
+++ b/customer/pixelpark-dns/dnsmaster02.pixelpark.com.yaml
@@ -2,6 +2,7 @@
 #infra::role: base
 infra::additional_classes:
   - bind
+  - logstash
 
 # Necessary, because the host has a local caching only DNS resolver
 #puppetconf::server: puppetmaster01.pixelpark.com

diff --git a/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
index e2dd137e4f0e672321ec923bccc8e59dd3d886ac..c735fc708d0c531f9fd595aef35008c672cbe171 100644 (file)
--- a/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
+++ b/customer/pixelpark-mail/test-mail02.pixelpark.net.yaml
@@ -13,9 +13,6 @@ infra::additional_classes:
 # Necessary, because the host has a local caching only DNS resolver
 puppetconf::server: puppetmaster01.pixelpark.com
 
-#java::java_alternative: java-1.8.0-openjdk
-#java::java_alternative_path: /usr/lib/jvm/java-openjdk/bin
-
 #####################################################
 # Options for /etc/resolv.conf
 resolv_conf::nameservers: