From: Oliver Böttcher <oliver.boettcher@pixelpark.com>
Date: Tue, 11 Jul 2017 11:29:40 +0000 (+0200)
Subject: ODT - int newsletterservice
X-Git-Tag: v0.1.0~2675^2~3
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=d66941d22eeef4848852fad23d53ed969f09d036;p=pixelpark%2Fhiera.git

ODT - int newsletterservice
---

diff --git a/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml
index 421513ec..6f147f41 100644
--- a/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml
@@ -16,6 +16,8 @@ infra::profile::apache::pp_vhosts:
   odt:
     docroot: '/var/www'
     servername: int-odt-daimler-com.pixelpark.net
+    serveraliases:
+      - int-emmt-daimler-com.pixelpark.net
     ssl: true
     cert_servername: 'wildcard.pixelpark.net'
     cert_customer: 'pixelpark'
@@ -35,6 +37,7 @@ infra::profile::apache::pp_vhosts:
           - '^(.*)$ https://int-odt-daimler-com.pixelpark.net$1 [L,R=301]'
     proxy_preserve_host: true
     proxy_pass:
+      - { path; /newsletterservice, url: 'http://localhost:8081/newsletterservice' }
       - { path: /, url: 'ajp://localhost:8009/' }
     directories:
       - webservice:
@@ -45,6 +48,25 @@ infra::profile::apache::pp_vhosts:
           - 'ip 217.66.50.0/24'
           - 'ip 217.66.51.0/24'
         custom_fragment: "SSLVerifyClient none"
+      - newsletterservice:
+        provider: location
+        path: '/newsletterservice'
+        require:
+            - ip 217.66.51.0/24
+            - ip 217.66.50.0/24
+            - ip 217.66.56.0/24
+            - ip 213.61.96.226
+            - ip 176.28.25.242
+            - ip 100.97.70.141
+            - ip 37.120.57.39
+            - ip 46.30.59.148
+            - ip 82.165.141.125
+            - ip 37.120.103.75
+            - ip 83.125.19.254
+            - ip 192.168.170.49
+            - ip 192.168.170.53
+            - ip 192.168.170.52
+            - ip 54.205.87.231
 
 infra::profile::cron::cronjobs:
   fetchcrl: