fbb tls ws enable ssl

diff --git a/customer/fbb-webservice/test-webservice-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-webservice/test-webservice-berlin-airport-de.pixelpark.net.yaml
index 81fee3145ae87119f9acbd3f9c26e490e382d1b7..3bd46fa78fcde6d07b5f1813fe9902706f049c85 100644 (file)
--- a/customer/fbb-webservice/test-webservice-berlin-airport-de.pixelpark.net.yaml
+++ b/customer/fbb-webservice/test-webservice-berlin-airport-de.pixelpark.net.yaml
@@ -103,57 +103,15 @@ infra::profile::apache::htdigest:
 infra::profile::apache::pp_vhosts:
   webservice:
     port: 80
+    ssl_port: 81
     servername: test-webservice-berlin-airport-de.pixelpark.net
     serveraliases:
       - tstws.berlin-airport.de
     docroot: /www/htdocs/tstws.berlin-airport.de/docs/
-    ssl: false
+#    ssl: false
     access_log_format: lb_combined
     docroot_owner: apache
     docroot_group: apache
-    setenv:
-      - AIRLINE_DATA /www/data/fiona/app/online/docs/_airlines/index.php
-      - POI_CMS_EXPORT_FILE /www/data/fiona/app/online/docs/poiExport/index.php
-    setenvif_non_ssl:
-      - 'HTTPS on HTTPS=on'
-    directories:
-      - provider: 'directory'
-        path: "/www/htdocs/tstws.berlin-airport.de"
-        addhandlers:
-          - { handler: "proxy:unix:/var/run/php5-fpm-webservice.sock|fcgi://./" , extensions: '.php' }
-        options:
-          - FollowSymLinks
-        allow_override:
-          - All
-      - provider: 'location'
-        path: '/webservices_conf'
-        require: 'all denied'
-      - provider: 'locationmatch'
-        path: '/webservices/(config.ini|certificates)'
-        require: 'all denied'
-      - provider: location
-        path: '/webservices/push'
-        auth_type: Digest
-        auth_name: 'server'
-        auth_digest_provider: file
-        auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'
-    rewrites:
-      - comment: 'BERFBB-3603'
-        rewrite_rule:
-          - '^/webservices/payment/getProductTicketListForCustomerId.php(.*)$ http://tstws.berlin-airport.de/webservices/payment/getProductTicketList.php$1'
-
-  webservice_ssl:
-    port: 81
-    servername: test-webservice-berlin-airport-de.pixelpark.net
-    serveraliases:
-      - tstws.berlin-airport.de
-    docroot: /www/htdocs/tstws.berlin-airport.de/docs/
-    ssl: false
-    access_log_format: lb_combined
-    docroot_owner: apache
-    docroot_group: apache
-    custom_fragment: 'UseCanonicalPhysicalPort On'
     setenv:
       - AIRLINE_DATA /www/data/fiona/app/online/docs/_airlines/index.php
       - POI_CMS_EXPORT_FILE /www/data/fiona/app/online/docs/poiExport/index.php
@@ -185,6 +143,49 @@ infra::profile::apache::pp_vhosts:
       - comment: 'BERFBB-3603'
         rewrite_rule:
           - '^/webservices/payment/getProductTicketListForCustomerId.php(.*)$ https://tstws.berlin-airport.de/webservices/payment/getProductTicketList.php$1'
+
+  # webservice_ssl:
+  #   port: 81
+  #   servername: test-webservice-berlin-airport-de.pixelpark.net
+  #   serveraliases:
+  #     - tstws.berlin-airport.de
+  #   docroot: /www/htdocs/tstws.berlin-airport.de/docs/
+  #   ssl: false
+  #   access_log_format: lb_combined
+  #   docroot_owner: apache
+  #   docroot_group: apache
+  #   custom_fragment: 'UseCanonicalPhysicalPort On'
+  #   setenv:
+  #     - AIRLINE_DATA /www/data/fiona/app/online/docs/_airlines/index.php
+  #     - POI_CMS_EXPORT_FILE /www/data/fiona/app/online/docs/poiExport/index.php
+  #   setenvif_non_ssl:
+  #     - 'HTTPS on HTTPS=on'
+  #   directories:
+  #     - provider: 'directory'
+  #       path: "/www/htdocs/tstws.berlin-airport.de"
+  #       addhandlers:
+  #         - { handler: "proxy:unix:/var/run/php5-fpm-webservice.sock|fcgi://./" , extensions: '.php' }
+  #       options:
+  #         - FollowSymLinks
+  #       allow_override:
+  #         - All
+  #     - provider: 'location'
+  #       path: '/webservices_conf'
+  #       require: 'all denied'
+  #     - provider: 'locationmatch'
+  #       path: '/webservices/(config.ini|certificates)'
+  #       require: 'all denied'
+  #     - provider: location
+  #       path: '/webservices/push'
+  #       auth_type: Digest
+  #       auth_name: 'server'
+  #       auth_digest_provider: file
+  #       auth_user_file: '/etc/httpd/htdigest'
+  #       auth_require: 'valid-user'
+  #   rewrites:
+  #     - comment: 'BERFBB-3603'
+  #       rewrite_rule:
+  #         - '^/webservices/payment/getProductTicketListForCustomerId.php(.*)$ https://tstws.berlin-airport.de/webservices/payment/getProductTicketList.php$1'
   unitb:
     servername: unitb-test-webservice-berlin-airport-de.pixelpark.net
     docroot: /www/htdocs/unitb/