spk-blog include insideforum to live

diff --git a/customer/spk-blog/sparkasseblog01.pixelpark.net.yaml b/customer/spk-blog/sparkasseblog01.pixelpark.net.yaml
index 0375d082cc6bd2c2d4c55d16b8def74fa04fb8a1..49375a71ee3ad280e26da91bea5593ced91ce0b3 100644 (file)
--- a/customer/spk-blog/sparkasseblog01.pixelpark.net.yaml
+++ b/customer/spk-blog/sparkasseblog01.pixelpark.net.yaml
@@ -15,6 +15,7 @@ accounts::users:
 
 infra::additional_classes:
   - infra::profile::wordpress
+  - infra::profile::apache_php
   - apache::mod::headers
   - infra::profile::cron
 
@@ -48,10 +49,10 @@ infra::profile::apache::htdigest:
 infra::profile::wordpress::projects:
   sparkasseblog:
     docroot: /var/www/sparkasseblog
-    servername: sparkasseblog01.sparkasse.local
+    servername: www.sparkasseblog.de
     serveraliases:
       - sparkasseblog.de
-      - www.sparkasseblog.de
+      - sparkasseblog01.pixelpark.net
     access_log_format: urchinpp
     ssl: false
     directories:
@@ -78,6 +79,62 @@ infra::profile::wordpress::projects:
         rewrite_rule:
           - '^(.*)$ http://www.onlinemagazin-spk-hef.de [R=301,L]'
 
+infra::profile::apache::pp_vhosts:
+  insideforum:
+    docroot: /var/www/sparkasseblog
+    docroot_owner: apache
+    docroot_group: apache
+    docroot_mode: '2770'
+    servername: insideforum.sparkasseblog.de
+    serveraliases:
+      - insideforum-sparkasseblog-de.pixelpark.net
+    access_log_format: urchinpp
+    port: 81
+    ssl: true
+    cert_servername: 'sparkasseblog.de'
+    cert_customer: 'sparkasse'
+    ssl_cert: '/etc/pki/tls/certs/sparkasseblog.de-cert.pem'
+    ssl_key: '/etc/pki/tls/private/sparkasseblog.de-key.pem'
+    ssl_chain: '/etc/pki/tls/certs/sparkasseblog.de-cert.pem'
+    ssl_verify_client: optional
+    ssl_crl: '/etc/pki/tls/certs/spk-cacrl.pem'
+    ssl_ca: '/etc/pki/tls/certs/spk-root-ca.pem'
+    ssl_verify_depth: '2'
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/var/www/sparkasseblog'
+        addhandlers:
+          - { handler: "proxy:unix:/var/run/php5-fpm-sparkasseblog.sock|fcgi://./" , extensions: '.php' }
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
+        directoryindex: 'index.php'
+#      - provider: location
+#        path: '/'
+#        auth_type: Digest
+#        auth_name: server
+#        auth_digest_provider: file
+#        auth_digest_algorithm: MD5
+#        auth_user_file: '/etc/httpd/htdigest'
+#        auth_require: 'valid-user'
+#        require:
+#          - local
+#      - provider: location
+#        path: '/wp-admin'
+#        auth_type: Digest
+#        auth_name: server2
+#        auth_digest_provider: file
+#        auth_digest_algorithm: MD5
+#        auth_user_file: '/etc/httpd/htdigest'
+#        auth_require: 'valid-user'
+#        require:
+#          - local
+    setenvif:
+      - "HTTPS on HTTPS=on"
+
 infra::profile::cron::cronjobs:
   fetch_d-trust_crl:
     ensure: 'present'