abbau truckworks

diff --git a/customer/mbvd-static/www-mbvd-static.pixelpark.net.yaml b/customer/mbvd-static/www-mbvd-static.pixelpark.net.yaml
index fc7898e44506fb60fe93bf9bf5777704cab252fe..fe65243631eeaf2f9af82db0985b55b88550f96d 100644 (file)
--- a/customer/mbvd-static/www-mbvd-static.pixelpark.net.yaml
+++ b/customer/mbvd-static/www-mbvd-static.pixelpark.net.yaml
@@ -196,103 +196,6 @@ infra::profile::apache::pp_vhosts:
           - '^(.*)/$ /$1/index.html [PT,L]'
     headers:
       - 'unset Server'
-  www.truckworks.de:
-    servername: www.truckworks.de
-    serveraliases:
-      - truckworks.de
-      - truckworks.dk
-      - truckworks.fr
-      - truckworks.com
-      - truckworks.es
-      - truckworks.it
-      - truckworks.pl
-      - truckworks.ru
-      - truckworks.be
-      - truckworks.ch
-      - truckworks.co.uk
-      - truckworks.eu
-      - truckworks.nl
-      - www.truckworks.dk
-      - www.truckworks.fr
-      - www.truckworks.com
-      - www.truckworks.es
-      - www.truckworks.it
-      - www.truckworks.pl
-      - www.truckworks.ru
-      - www.truckworks.be
-      - www.truckworks.ch
-      - www.truckworks.co.uk
-      - www.truckworks.eu
-      - www.truckworks.nl
-    docroot: /srv/www/truckworks
-    ssl: true
-    cert_customer: 'daimler'
-    proxy_preserve_host: true
-    proxy_pass:
-      - { path: /, url: 'http://192.168.170.135:47080/' }
-    rewrites:
-      - dk:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.dk$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/da [R,L]'
-      - fr:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.fr$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/fr [R,L]'
-      - com:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.com$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/en [R,L]'
-      - es:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.es$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/es [R,L]'
-      - it:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.it$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/it [R,L]'
-      - pl:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.pl$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/pl [R,L]'
-      - ru:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.ru$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/ru [R,L]'
-      - be:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.be$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/en [R,L]'
-      - ch:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.ch$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/en [R,L]'
-      - uk:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.co\.uk$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/en [R,L]'
-      - eu:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.eu$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/en [R,L]'
-      - nl:
-        rewrite_cond:
-          - '%{literal("%")}{HTTP_HOST} ^(www\.)?truckworks\.nl$'
-        rewrite_rule:
-          - '^(.*)$       http://www.truckworks.de/nl [R,L]'
-
-
 
 accounts::users:
   deploy.vogel:

diff --git a/customer/pixelpark/brauhaus.pixelpark.com.yaml b/customer/pixelpark/brauhaus.pixelpark.com.yaml
index 3b0442d3c925d4f4820fbb228ffd4a4ad755de38..bb7a1ec9b01e7ef860903a029a6859539a6d80c6 100644 (file)
--- a/customer/pixelpark/brauhaus.pixelpark.com.yaml
+++ b/customer/pixelpark/brauhaus.pixelpark.com.yaml
@@ -1,2 +1,24 @@
 ---
 infra::role: base
+accounts::users:
+  jenkins:
+    managed: false
+
+jenkins::lts: true
+infra::profile::infrastructure::jenkins::apache_vhosts:
+  jenkins:
+    server_name:
+      - brauhaus.pixelpark.com
+    proxy: http://localhost:8080
+    proxy_set_header:
+      - 'X-Forwarded-Proto "https"'
+      - 'X-Forwarded-For $proxy_add_x_forwarded_for'
+      - 'X-Real-IP $remote_addr'
+      - 'Host $host'
+    ssl: true
+    ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem
+    ssl_key: /etc/pki/tls/private/wildcard.pixelpark.com-key.pem
+    rewrite_to_https: true
+    proxy_connect_timeout: "600"
+    proxy_read_timeout: "600"
+    proxy_connect_timeout: "600"