From: Oliver Böttcher <oliver.boettcher@pixelpark.com>
Date: Tue, 19 Jul 2016 15:34:26 +0000 (+0200)
Subject: bkk
X-Git-Tag: v0.1.0~4502
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=e6f647bc89a9468e4d09820cc5b6e7232f52bf99;p=pixelpark%2Fhiera.git

bkk
---

diff --git a/customer/bkk-vbu/common.yaml b/customer/bkk-vbu/common.yaml
index 899ee00b..ad8d40af 100644
--- a/customer/bkk-vbu/common.yaml
+++ b/customer/bkk-vbu/common.yaml
@@ -30,7 +30,6 @@ site::additional_classes:
   - repo::redhat::passenger
   - apache::mod::passenger
   - site::profile::symfony
-  - site::profile::apache
 
 apache::default_vhost: false
 apache::mpm_module: worker
diff --git a/customer/bkk-vbu/dev-web01-meine-krankenkasse-de.pixelpark.net.yaml b/customer/bkk-vbu/dev-web01-meine-krankenkasse-de.pixelpark.net.yaml
index bf77e9de..1a778a99 100644
--- a/customer/bkk-vbu/dev-web01-meine-krankenkasse-de.pixelpark.net.yaml
+++ b/customer/bkk-vbu/dev-web01-meine-krankenkasse-de.pixelpark.net.yaml
@@ -72,48 +72,6 @@ site::profile::apache::pp_vhosts:
           - '%%{ich-trickse}{HTTPS} !=on'
         rewrite_rule:
           - ^(.*)$ https://%%{ich-trickse}{HTTP_HOST}$1 [R=301,L]
-
-site::profile::typo3::projects:
-  cms01:
-    version: '7.6.9'
-    site_path: '/var/www/bkk-meine-krankenkasse'
-    db_pass: '5PQQ3NC55JFP'
-    db_user: bkk
-    db_name: bkk
-    ip: 192.168.16.4
-    servername: dev-cms01-meine-krankenkasse-de.pixelpark.net
-    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
-    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    redirect_dest_non_ssl: 'https://dev-cms01-meine-krankenkasse-de.pixelpark.net/'
-    directories:
-      - location1:
-        provider: location
-        path: '/'
-        auth_type: Digest
-        auth_name: cms
-        auth_digest_provider: file
-        auth_digest_algorithm: MD5
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'
-        require: local
-    user: deploy.vogel
-    mode: '2775'
-
-site::profile::symfony::manage_php: false
-site::profile::symfony::projects:
-  member01:
-    servername: dev-member01-meine-krankenkasse-de.pixelpark.net
-    ip: 192.168.16.4
-    docroot: '/var/www/bkk-member'
-    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
-    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    redirect_dest_non_ssl: 'https://dev-member01-meine-krankenkasse-de.pixelpark.net'
-    user: deploy.vogel
-    mode: '2775'
-
-site::profile::apache::pp_vhosts:
   imagetool01:
     docroot: '/var/www/bkk-imagetool/frontend/dist/static'
     ip: 192.168.16.5
@@ -161,3 +119,44 @@ site::profile::apache::pp_vhosts:
         path: '/var/www/bkk-imagetool'
         options:
         - None
+
+site::profile::typo3::projects:
+  cms01:
+    version: '7.6.9'
+    site_path: '/var/www/bkk-meine-krankenkasse'
+    db_pass: '5PQQ3NC55JFP'
+    db_user: bkk
+    db_name: bkk
+    ip: 192.168.16.4
+    servername: dev-cms01-meine-krankenkasse-de.pixelpark.net
+    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
+    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    redirect_dest_non_ssl: 'https://dev-cms01-meine-krankenkasse-de.pixelpark.net/'
+    directories:
+      - location1:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: cms
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+        require: local
+    user: deploy.vogel
+    mode: '2775'
+
+site::profile::symfony::manage_php: false
+site::profile::symfony::projects:
+  member01:
+    servername: dev-member01-meine-krankenkasse-de.pixelpark.net
+    ip: 192.168.16.4
+    docroot: '/var/www/bkk-member'
+    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
+    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+    redirect_dest_non_ssl: 'https://dev-member01-meine-krankenkasse-de.pixelpark.net'
+    user: deploy.vogel
+    mode: '2775'
+