MBVD-special - cleanup vhost

diff --git a/customer/mbvd-specials/web-specials-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-specials/web-specials-mercedes-benz-de.pixelpark.net.yaml
index 2110f37109ffb1c52616e252df21a2664d3f78d8..81d57a07f46c32aff1dbd87070f7e94c170d9b58 100644 (file)
--- a/customer/mbvd-specials/web-specials-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-specials/web-specials-mercedes-benz-de.pixelpark.net.yaml
@@ -1,63 +1,25 @@
 ---
 infra::role: base
 infra::additional_classes:
-  - infra::profile::apache_php
+  - infra::profile::apache
     #- minio
 
 apache::mpm_module: event
-apache::default_vhost: false
-repo::remi_php56: true
 
-php::fpm::pools:
-  specials:
-    listen: /var/run/php5-fpm-specials.sock
-    listen_owner: 'apache'
-    listen_group: 'apache'
-    listen_mode: '0660'
-    user: apache
-    group: apache
-    pm: dynamic
-    pm_max_children: 4
-    pm_start_servers: 2
-    pm_min_spare_servers: 2
-    pm_max_spare_servers: 4
-    pm_max_requests: 10000
-    slowlog: "/var/log/php-fpm/specials-slow.log"
-    pm_status_path: '/status'
-    ping_path: '/ping'
-    ping_response: 'pong'
-    request_terminate_timeout: '5m'
-    request_slowlog_timeout: '10s'
-    catch_workers_output: 'yes'
-  www:
-    ensure: absent
-
-infra::profile::apache::vhosts:
+infra::profile::apache::pp_vhosts:
   specials-mb-de:
     servername: web-specials-mercedes-benz-de.pixelpark.net
     serveraliases:
       - specials.mercedes.benz.de
     docroot: '/var/www/specials.mercedes-benz.de'
-    ip: 192.168.170.30
-    port: 80
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/var/www/specials.mercedes-benz.de'
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-specials.sock|fcgi://." , extensions: '.php' }
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-        directoryindex: index.html index.php
-      - location_php_fpm:
-        provider: location
-        path: '/status'
-        require:
-          - 'ip 127.0.0.1 ::1 217.66.51.0/24'
-        sethandler: "proxy:unix:/var/run/php5-fpm-specials.sock|fcgi://."
+    ssl: false
+    proxy_preserve_host: true
+    proxy_pass:
+      - path: '/api'
+        url: 'http://localhost:9000'
+    setenvif:
+      - 'HTTPS on HTTPS=on'
+
 
 minio::owner: nobody
 minio::group: nobody