From: Oliver Böttcher <oliver.boettcher@pixelpark.com>
Date: Thu, 10 Nov 2016 14:47:17 +0000 (+0100)
Subject: mbvd newsletter umzug
X-Git-Tag: v0.1.0~3831
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=19de4bebc9e99bb6d977d4d465b7d5e0f03a63cf;p=pixelpark%2Fhiera.git

mbvd newsletter umzug
---

diff --git a/customer/pixelpark/design-berlin.pixelpark.net.yaml b/customer/pixelpark/design-berlin.pixelpark.net.yaml
index efc76cdb..8134592c 100644
--- a/customer/pixelpark/design-berlin.pixelpark.net.yaml
+++ b/customer/pixelpark/design-berlin.pixelpark.net.yaml
@@ -3,10 +3,6 @@ site::role: base
 site::additional_classes:
   - site::profile::apache_php
 
-accounts::users:
-  sftp1:
-    apply: true
-
 repo::remi_php55: true
 php::settings:
   Date/date.timezone: Europe/Berlin
@@ -15,6 +11,9 @@ php::settings:
 accounts::users:
   sftp1:
     apply: true
+  jenkins:
+    apply: true
+    group: apache
 
 site::profile::apache::pp_vhosts:
   design-berlin:
@@ -44,4 +43,54 @@ site::profile::apache::pp_vhosts:
         auth_digest_provider: file
         auth_digest_algorithm: MD5  
         auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'
\ No newline at end of file
+        auth_require: 'valid-user'
+  mbvd-internal-nl:
+    servername: mbvd-internal-nl.pixelpark.net
+    serveraliases:
+      - mbvd-internal-nl.cloud.pixelpark.net
+    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
+    docroot_owner: 'jenkins'
+    docroot_group: 'apache'
+    docroot_mode: '0750'
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/srv/www/mbvd-internal-nl.pixelpark.net'
+      - location_root:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: nl-frontend
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+        require:
+          - 'ip 217.66.49 217.66.50 217.66.51'
+  mbvd-wholesale-nl:
+    servername: mbvd-wholesale-nl.pixelpark.net
+    serveraliases:
+      - mbvd-wholesale-nl.cloud.pixelpark.net
+    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
+    docroot_owner: 'jenkins'
+    docroot_group: 'apache'
+    docroot_mode: '0750'
+    directories:
+      - directory1:
+        provider: directory
+        path: '/srv/www/mbvd-wholesale-nl.pixelpark.net'
+      - location_root:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: nl-frontend
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+        require:
+          - 'ip 217.66.49 217.66.50 217.66.51'