From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Tue, 28 Mar 2017 15:22:36 +0000 (+0200)
Subject: pixelpark modify settings jira02
X-Git-Tag: v0.1.0~3381
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a92573508bda4731b3defb11150fdf1686c5a457;p=pixelpark%2Fhiera.git

pixelpark modify settings jira02
---

diff --git a/customer/pixelpark-pmp/jira02.pixelpark.com.yaml b/customer/pixelpark-pmp/jira02.pixelpark.com.yaml
index 8bf7a240..a0ea39d5 100644
--- a/customer/pixelpark-pmp/jira02.pixelpark.com.yaml
+++ b/customer/pixelpark-pmp/jira02.pixelpark.com.yaml
@@ -2,7 +2,6 @@
 site::role: base
 site::additional_classes:
   - site::profile::apache_php
-  - site::profile::mysql_server
 
 apache::mpm_module: event
 apache::default_vhost: false
@@ -10,9 +9,6 @@ repo::remi_php70: true
 
 php::extensions:
   xml: {}
-  mcrypt: {}
-  mysqlnd: {}
-  intl: {}
   opcache: {}
 
 php::settings:
@@ -24,19 +20,12 @@ accounts::users:
     groups: apache
     sudo: true
 
-mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAGBaqitySqMeMgABqrNi3gSU0EcuP1ftqGPBxvHpBIILV6NtFKj/LXaLPR7vs9icSIwPoMluuSlAz1+LA1E9WBXYskPocFeaMy4LAaJ1kHfBJMToWTROli8SSg7nPIFlj/2xugT/PMrnhov9EhyCva3HGVQy8Yuv7+6jDPgbI5w8h1luRuhHKdaw0XqbvoK5TifHqk4Z/3TY4y3lrEbyhLVKbcStoFoi7EZ56vgK5STCQpw971hgj7Q+19kruvtG4PJ3o8TWj3vQwwfaZk6bigd4WTsvtu1kTCIz5MQwqL6APZqfrhYTCIzbzMAHX3Zz+PfDnnmfHS+IVOkDyOqyZazBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCtksFv/FeQDyBjtrM+AvhrgCDnvVK5s2nUQuQDHam9xVyKqWb94Ac4n69LJXhpxM0azw==]
-mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATXBohmC5irF7PdA/nmkptwOuIzpDkUS5RrDrVt2AOGCjYohNDPxTu3LUSRyDdcWSfCJQS93sv/3azsT7vnlo3hgHI+alJ8sIn8lwAOG6jwx6NlPQy16sJlYM9ZeIBINYByy+N4Qluw1TLuzIRKg0xdpdPSN3sbr33lQlxAOr+rYJFbd1YRgl883arbEfJhFrEaxmOu/LnRKFhnzmJzckTTXIys9jghvCA+B2q1EWVMWWhwO8BsJNGubaiKzn/A1b6umVs50DNPw5p80bbIMJm+LGhFn+IPilYl8l5bapmxmAVrXOzHBJUa6gZZcsYGzo7yIBcS7vGjZJNtg4lok/lzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAEHFJOD4PJhZJcFKYD+6uxgCC7Il4N/js5pJ34rR60i1IF7SJ4N3kQDz1lFDWvVzW0Zg==]
-site::profile::mysql_server::databases:
-  miniapp:
-    user: miniapp
-    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmk+xS3jARX8bJDykl/rnGV11KWJTUzYD/1mnkeWp9kt5JVYaTu4+wL8aY1BHPROG8QBGYOFOJ1+7vHgiMajkpHTGI1HsKobczJRhs6CVdJQLmw8T60CAE4ixfJ38Wm6lzI+OQIXhCaJ2/BEbyMtlFA5gDnB5oTwFVQWZiWGWGZgEhDDwAtn/4eUFAcnjED3HIS9LLuBI8D98D+VGf4feTjs3t9Ei45I0x0QMgqKSE+KgExyHiSmNq3kjHwpHcMmKCggikOuJOK8oU3T1RjjRqD/Pj8SReIEg5CqW1wMQyKo+yCM0ss2X2heFZ1q98WB9eu7pFRysQ9w1pAFHXyQz0DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDyJtN9Z0lqc8hCZ+SfL4kagCATkOQf+ZxUoNFniL2W6PUyQxvGOMiFaK/mH1bdxUtNQw==]
-
 php::fpm::pools:
   www:
     ensure: absent
 
 site::profile::apache_php::fpm_pool:
-  miniapp:
+  pressthebird:
     listen_owner: apache
     listen_group: apache
 
@@ -45,11 +34,9 @@ site::profile::apache::htdigest:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQsgfqgYOM2UCd0iIF7Ps0fXuGjOCL+Z975boQ229SHtJdoJpraQM/IA66Ma6YfXyIEncAbj/uX1C1c7u/8eyDb6f1lZLKEqEqYLK+b0awgJMPOIK8bvLjwqsNQ9/ct5Md3tVk5EWvfVlOHtKOxQQESPFjG8ZCHvBN0lRjvmmEckL+6nTNaN6flrHlBzeAfKgIKKaipjg51laBmh3t3Pk88+3Bh1EPlBTEmsa5nK2gO3dmcKuUhVmkUwtocIKcjMrt+r2xR1cxhvu9ffm6fHwTP02f6aAxQ2KbarAPW5FxDRvsHvHXPCZ7naLqd4Y46euTskfiWgDzx0BJCOMZAFPyTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBab0txA6Fx97KxImehKLHAgBDGbLA/OUJOq7KMSAlAkmMd]
 
 site::profile::apache::pp_vhosts:
-  miniapp:
-    docroot: /var/www/miniapp
-    servername: jira02.pixelpark.com # WAF Domain
-    serveraliases:
-      - jira.pixelpark.com # Realserver Domain
+  pressthebird:
+    docroot: /var/www/press-the-bird/public
+    servername: pressthebird.pixelpark.com
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.com-key.pem'
@@ -59,9 +46,9 @@ site::profile::apache::pp_vhosts:
     directories:
       - directory_root:
         provider: directory
-        path: '/var/www/miniapp'
+        path: '/var/www/press-the-bird/public'
         addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-miniapp.sock|fcgi://./" , extensions: '.php' }
+          - { handler: "proxy:unix:/var/run/php5-fpm-pressthebird.sock|fcgi://./" , extensions: '.php' }
         options:
           - FollowSymLinks
           - MultiViews
@@ -77,4 +64,18 @@ site::profile::apache::pp_vhosts:
 #        auth_digest_algorithm: MD5
 #        auth_user_file: '/etc/httpd/htdigest'
 #        auth_require: 'valid-user'
+    rewrites:
+      - alias:
+        comment: 'Weiterleitung auf echte URL'
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP_HOST} !^pressthebird\.pixelpark\.com$ [NC]'
+        rewrite_rule:
+          - '^(.*)$ https://pressthebird.pixelpark.com$1 [R=301,L]'
+      - alias1:
+        comment: 'Weiterleitung auf https'
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTP:HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^(.*)$ https://pressthebird.pixelpark.com$1 [R=301,L]'
+