From: Oliver Böttcher <oliver.boettcher@pixelpark.com>
Date: Wed, 21 Feb 2018 14:39:33 +0000 (+0100)
Subject: INT-ODT - new host
X-Git-Tag: v0.1.0~1557^2~5
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=8dfdb15e045e4f438e1e58f39a0c7c057b01483a;p=pixelpark%2Fhiera.git

INT-ODT - new host
---

diff --git a/customer/mbvd-odt/int-tmp-cms-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/int-tmp-cms-odt-daimler-com.pixelpark.net.yaml
index 51873aa0..30a35958 100644
--- a/customer/mbvd-odt/int-tmp-cms-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/int-tmp-cms-odt-daimler-com.pixelpark.net.yaml
@@ -20,8 +20,6 @@ infra::additional_classes:
 apache::mod:proxy:
   proxy_via: 'Off'
 
-apache::default_vhost: false
-
 infra::profile::apache::pp_vhosts:
   int-cms:
     docroot: '/var/lib/tomcat/catalina/odt-cms/webapps/ROOT'
@@ -29,7 +27,6 @@ infra::profile::apache::pp_vhosts:
     docroot_group: tomcat
     servername: int-cms-odt-daimler-com.pixelpark.net
     ssl: true
-    ip: 93.188.107.242
     cert_servername: 'wildcard.pixelpark.net'
     cert_customer: 'pixelpark'
     ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
@@ -86,7 +83,6 @@ infra::profile::apache::pp_vhosts:
     docroot_group: tomcat
     servername: int-newsletter-mercedes-benz-de.pixelpark.net
     ssl: true
-    ip: 93.188.107.242
     cert_servername: 'wildcard.pixelpark.net'
     cert_customer: 'pixelpark'
     ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
@@ -156,7 +152,6 @@ infra::profile::apache::pp_vhosts:
     docroot_group: tomcat
     servername: int-newsletter-smart-de.pixelpark.net
     ssl: true
-    ip: 93.188.107.242
     cert_servername: 'wildcard.pixelpark.net'
     cert_customer: 'pixelpark'
     ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
@@ -226,7 +221,6 @@ infra::profile::apache::pp_vhosts:
     docroot_group: tomcat
     servername: int-newsletter-truckworks-de.pixelpark.net
     ssl: true
-    ip: 93.188.107.242
     cert_servername: 'wildcard.pixelpark.net'
     cert_customer: 'pixelpark'
     ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
@@ -294,7 +288,6 @@ infra::profile::apache::pp_vhosts:
     servername: int-kampagnen-mercedes-benz-de.pixelpark.net
     docroot: /srv/www/htdocs
     ssl: true
-    ip: 93.188.107.242
     cert_servername: 'wildcard.pixelpark.net'
     cert_customer: 'pixelpark'
     ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
@@ -308,15 +301,14 @@ infra::profile::apache::pp_vhosts:
           - '^(.*)$ https://int-kampagnen-mercedes-benz-de.pixelpark.net$1 [L,R=301]'
     proxy_pass:
       - { path: /, url: 'http://localhost:9000/' }
-#  bilder:
-#    servername: int-bilder-mercedes-benz-de.pixelpark.net
-#    serveraliases:
-#      - int-bilder-emmt-mercedes-benz-de.pixelpark.net
-#    docroot: /home/ftp/ftpuser1/docs
-#    ssl: true
-#    cert_servername: 'wildcard.pixelpark.net'
-#    cert_customer: 'pixelpark'
-#    ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
-#    ssl_key: '/etc/ssl/private/wildcard.pixelpark.net-key.pem'
-#    ssl_chain: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
-#    ip: 93.188.107.242
+  bilder:
+    servername: int-bilder-mercedes-benz-de.pixelpark.net
+    serveraliases:
+      - int-bilder-emmt-mercedes-benz-de.pixelpark.net
+    docroot: /home/ftp/ftpuser1/docs
+    ssl: true
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
+    ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
+    ssl_key: '/etc/ssl/private/wildcard.pixelpark.net-key.pem'
+    ssl_chain: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'