From 908dff9d00036d5b4fd7bc3786e7c8ecd0aa71bf Mon Sep 17 00:00:00 2001
From: Philipp Dallig <philipp.dallig@pixelpark.com>
Date: Wed, 5 Apr 2017 14:54:16 +0200
Subject: [PATCH] fbb-werbung - move some informations to development.yaml

---
 ...rbung-berlin-airport-de.pixelpark.net.yaml | 43 ------------------
 ...rbung-berlin-airport-de.pixelpark.net.yaml |  2 +
 customer/fbb-werbung/development.yaml         | 44 +++++++++++++++++++
 3 files changed, 46 insertions(+), 43 deletions(-)
 create mode 100644 customer/fbb-werbung/development.yaml

diff --git a/customer/fbb-werbung/dev-red-werbung-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-werbung/dev-red-werbung-berlin-airport-de.pixelpark.net.yaml
index 30e5d1fc..4f830d3f 100644
--- a/customer/fbb-werbung/dev-red-werbung-berlin-airport-de.pixelpark.net.yaml
+++ b/customer/fbb-werbung/dev-red-werbung-berlin-airport-de.pixelpark.net.yaml
@@ -7,49 +7,6 @@ site::additional_classes:
   - maven
   - site::profile::postfix
 
-accounts::users:
-  jenkins:
-    apply: true
-
-# Add specific sudo rights for CI Deployment
-sudo::configs:
-  becometomcat:
-    priority: "06"
-    content: |
-      jenkins ALL=(root) NOPASSWD: ALL 
-      jenkins ALL=(tomcat) NOPASSWD: ALL
-
-# Postfix Config
-postfix::myorigin: 'pixelpark.com'
-site::profile::postfix::hashes:
-  '/etc/postfix/virtual':
-    ensure: present
-  '/etc/postfix/generic':
-    ensure: present
-    content: |
-      root      root+%{hostname}
-site::profile::postfix::configs:
-  virtual_alias_maps:
-    value: 'pcre:/etc/postfix/virtual_pcre hash:/etc/postfix/virtual'
-  smtp_generic_maps:
-    value: 'hash:/etc/postfix/generic'
-  recipient_delimiter:
-    value: '+'
-  relayhost:
-    value: 'mx.pixelpark.net'
-site::profile::postfix::virtuals:
-  'root':
-    destination: 8x5@pixelpark.com
-  'httpd':
-    destination: root
-site::profile::postfix::files:
-  /etc/postfix/virtual_pcre:
-    owner: root
-    group: root
-    mode: '0644'
-    content: |
-      /\w+\@(?!pixelpark.com|publicispixelpark.de|berlin-airport.de)/ andre.staats@publicispixelpark.de
-
 
 site::profile::pg_server::pgpw: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHW+F1Q3vJWv/aCsBzVz1kV3wx06Us25l2WnIKOtED7zbePanPsnKhi+QFRnRQDSjUnPag+NQ7C6h7vq+lnx5THMuFmoN1fiqu7cpGR0uvryo6PcTeYdOEvnvfmqPrpaISBKyZeEegSug3KcTv4+08tzpBYUoL2YZJy9Q4GpFw3WquTgymxweDAvMwB6yqZ3hvec4bsC+RD+vKsSLtdgJCV+h345qVEiQPbFhwzT3tw3+whsHgkyCDOBs6yKpNWGbb/2u7EP/bqZ39ko4xleCCkUld47A8c8TWHIongLKN5iFrgDX2nRpxCOaZe00I63hcEGOOUlHzPhro5Kk70oDXjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBKIzQrX3Lcve6Vm7WCaXvegCCw7pC5cThiyprSbBtEwQVMsj5twqZRFMru6z7Rh9kshQ==]
 site::profile::pg_server::version: '9.6'
diff --git a/customer/fbb-werbung/dev-werbung-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-werbung/dev-werbung-berlin-airport-de.pixelpark.net.yaml
index 4c3c2b5e..497bf102 100644
--- a/customer/fbb-werbung/dev-werbung-berlin-airport-de.pixelpark.net.yaml
+++ b/customer/fbb-werbung/dev-werbung-berlin-airport-de.pixelpark.net.yaml
@@ -1,2 +1,4 @@
 ---
 site::role: base
+site::additional_classes:
+  - java
\ No newline at end of file
diff --git a/customer/fbb-werbung/development.yaml b/customer/fbb-werbung/development.yaml
new file mode 100644
index 00000000..bfa746ff
--- /dev/null
+++ b/customer/fbb-werbung/development.yaml
@@ -0,0 +1,44 @@
+---
+
+accounts::users:
+  jenkins:
+    apply: true
+
+# Add specific sudo rights for CI Deployment
+sudo::configs:
+  becometomcat:
+    priority: "06"
+    content: |
+      jenkins ALL=(root) NOPASSWD: ALL 
+      jenkins ALL=(tomcat) NOPASSWD: ALL
+
+# Postfix Config
+postfix::myorigin: 'pixelpark.com'
+site::profile::postfix::hashes:
+  '/etc/postfix/virtual':
+    ensure: present
+  '/etc/postfix/generic':
+    ensure: present
+    content: |
+      root      root+%{hostname}
+site::profile::postfix::configs:
+  virtual_alias_maps:
+    value: 'pcre:/etc/postfix/virtual_pcre hash:/etc/postfix/virtual'
+  smtp_generic_maps:
+    value: 'hash:/etc/postfix/generic'
+  recipient_delimiter:
+    value: '+'
+  relayhost:
+    value: 'mx.pixelpark.net'
+site::profile::postfix::virtuals:
+  'root':
+    destination: 8x5@pixelpark.com
+  'httpd':
+    destination: root
+site::profile::postfix::files:
+  /etc/postfix/virtual_pcre:
+    owner: root
+    group: root
+    mode: '0644'
+    content: |
+      /\w+\@(?!pixelpark.com|publicispixelpark.de|berlin-airport.de)/ andre.staats@publicispixelpark.de
\ No newline at end of file
-- 
2.39.5