From: Andre Schmelzer <andre.schmelzer@pixelpark.com>
Date: Mon, 26 Jun 2017 12:15:31 +0000 (+0200)
Subject: design-berlin hinzugefuegt [OPS-90]
X-Git-Tag: v0.1.0~2762
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=349a31682dbb9addc867c41c5507adba27ee2dcb;p=pixelpark%2Fhiera.git

design-berlin hinzugefuegt [OPS-90]
---

diff --git a/customer/pixelpark/design-berlin.pixelpark.net.yaml b/customer/pixelpark/design-berlin.pixelpark.net.yaml
index 8d4ec2cf..3b0442d3 100644
--- a/customer/pixelpark/design-berlin.pixelpark.net.yaml
+++ b/customer/pixelpark/design-berlin.pixelpark.net.yaml
@@ -1,119 +1,2 @@
 ---
 infra::role: base
-infra::additional_classes:
-  - infra::profile::apache_php
-
-repo::remi_php70: true
-php::settings:
-  Date/date.timezone: Europe/Berlin
-  PHP/expose_php: 'Off'
-
-accounts::users:
-  sftp1:
-    apply: true
-  jenkins:
-    apply: true
-    group: apache
-
-infra::profile::apache::htdigest:
-  nl-frontend:
-    preview: "Dwnkip1!"
-  Limitierung:
-    extern: "pixel2012"
-
-infra::profile::apache::pp_vhosts:
-  design-berlin:
-    servername: design-berlin.pixelpark.net
-    docroot: '/srv/www/design-berlin.pixelpark.net'
-    serveraliases:
-      - www.design-berlin.pixelpark.net
-    port: 80
-    custom_fragment: 'ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/design-berlin.pixelpark.net/$1'
-    cert_servername: 'wildcard.pixelpark.net'
-    cert_customer: 'pixelpark'
-    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'
-    custom_fragment: 'ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/design-berlin.pixelpark.net/$1'
-    directories:
-      - directory1:
-        provider: directory
-        path: '/srv/www/design-berlin.pixelpark.net'
-        options:
-          - Indexes
-          - FollowSymLinks
-          - MultiViews
-      - location1:
-        provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: Limitierung
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'
-  mbvd-internal-nl:
-    servername: mbvd-internal-nl.pixelpark.net
-    serveraliases:
-      - mbvd-internal-nl.cloud.pixelpark.net
-    cert_servername: 'wildcard.pixelpark.net'
-    cert_customer: 'pixelpark'
-    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: '/srv/www/mbvd-internal-nl.pixelpark.net'
-    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'
-        require:
-          requires:
-            - 'valid-user'
-            - 'ip 217.66.49 217.66.50 217.66.51'
-          enforce: any
-    rewrites_non_ssl:
-      - http_to_https:
-        comment: 'Alles auf https umleiten'
-        rewrite_rule:
-          - ^(.*)$  https://mbvd-internal-nl.pixelpark.net$1  [R=301,QSA,L]
-  mbvd-wholesale-nl:
-    servername: mbvd-wholesale-nl.pixelpark.net
-    serveraliases:
-      - mbvd-wholesale-nl.cloud.pixelpark.net
-    cert_servername: 'wildcard.pixelpark.net'
-    cert_customer: 'pixelpark'
-    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: '/srv/www/mbvd-wholesale-nl.pixelpark.net'
-    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'
-        require:
-          requires:
-            - 'valid-user'
-            - 'ip 217.66.49 217.66.50 217.66.51'
-          enforce: any