From: Thomas Heller <thomas.heller@pixelpark.com>
Date: Fri, 24 Aug 2018 09:04:45 +0000 (+0200)
Subject: created new jenkins vhost
X-Git-Tag: v0.1.0~307^2
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=63fed8faa6f1210aabfd7f21d28c30e76d8a52e0;p=pixelpark%2Fhiera.git

created new jenkins vhost
---

diff --git a/customer/spk-jenkins/stage-services01.sfp.devops.pixelpark.net.yaml b/customer/spk-jenkins/stage-services01.sfp.devops.pixelpark.net.yaml
index 6b592caf..634e113e 100644
--- a/customer/spk-jenkins/stage-services01.sfp.devops.pixelpark.net.yaml
+++ b/customer/spk-jenkins/stage-services01.sfp.devops.pixelpark.net.yaml
@@ -30,7 +30,7 @@ infra::profile::apache::pp_vhosts:
     rewrites:
       - comment: 'Alles auf https umleiten.'
         rewrite_cond:
-        - '%%{ich-trickse}{HTTPS} !=on'
+          - '%%{ich-trickse}{HTTPS} !=on'
         rewrite_rule:
           - ^(.*)$ https://%{literal("%")}{HTTP_HOST}$1 [R=301,L]
     request_headers_ssl:
@@ -65,7 +65,7 @@ infra::profile::apache::pp_vhosts:
       - 'set X-Forwarded-Proto "https"'
   stage_sfp_registry:
     docroot: '/srv'
-  servername: 'stage-sfp-registry.pixelpark.net'
+    servername: 'stage-sfp-registry.pixelpark.net'
     cert_servername: 'wildcard.pixelpark.net'
     cert_customer: 'pixelpark'
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
@@ -91,22 +91,3 @@ infra::profile::apache::pp_vhosts:
           - ^(.*)$ https://%{literal("%")}{HTTP_HOST}$1 [R=301,L]
     request_headers_ssl:
       - 'set X-Forwarded-Proto "https"'
-
-#nginx::nginx_vhosts:
-#  jenkins:
-#    server_name:
-#      - stage-jenkins-sfp-devops.pixelpark.net
-#    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"
-#