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 f75004b598e3b9521ddabbc53f3d1e1709174dec..c565b83645fdba49acd5abbf4f4d282373013af4 100644 (file)
--- a/customer/spk-jenkins/stage-services01.sfp.devops.pixelpark.net.yaml
+++ b/customer/spk-jenkins/stage-services01.sfp.devops.pixelpark.net.yaml
@@ -34,34 +34,34 @@ infra::profile::apache::pp_vhosts:
           - ^(.*)$ https://%{literal("%")}{HTTP_HOST}$1 [R=301,L]
     request_headers_ssl:
       - 'set X-Forwarded-Proto "https"'
-  jenkins:
-    docroot: '/srv'
-    servername: 'stage-jenkins-sfp-devops.pixelpark.net'
-    cert_servername: 'wildcard.pixelpark.net'
-    cert_customer: 'pixelpark'
-    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
-    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    proxy_preserve_host: true
-    proxy_pass:
-      - { path: /, url: 'http://127.0.0.1:8080/' }
-    directories:
-      # Root Directory
-      - provider: directory
-        path: '/srv'
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - None
-    rewrites:
-      - comment: 'Alles auf https umleiten.'
-        rewrite_cond:
-          - '%%{ich-trickse}{HTTPS} !=on'
-        rewrite_rule:
-          - ^(.*)$ https://%{literal("%")}{HTTP_HOST}$1 [R=301,L]
-    request_headers_ssl:
-      - 'set X-Forwarded-Proto "https"'
+#  jenkins:
+#    docroot: '/srv'
+#    servername: 'stage-jenkins-sfp-devops.pixelpark.net'
+#    cert_servername: 'wildcard.pixelpark.net'
+#    cert_customer: 'pixelpark'
+#    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+#    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
+#    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
+#    proxy_preserve_host: true
+#    proxy_pass:
+#      - { path: /, url: 'http://127.0.0.1:8080/' }
+#    directories:
+#      # Root Directory
+#      - provider: directory
+#        path: '/srv'
+#        options:
+#          - FollowSymLinks
+#          - MultiViews
+#        allow_override:
+#          - None
+#    rewrites:
+#      - comment: 'Alles auf https umleiten.'
+#        rewrite_cond:
+#          - '%%{ich-trickse}{HTTPS} !=on'
+#        rewrite_rule:
+#          - ^(.*)$ https://%{literal("%")}{HTTP_HOST}$1 [R=301,L]
+#    request_headers_ssl:
+#      - 'set X-Forwarded-Proto "https"'
   stage_sfp_registry:
     docroot: '/srv'
     servername: 'stage-sfp-registry.pixelpark.net'
@@ -90,3 +90,22 @@ infra::profile::apache::pp_vhosts:
           - ^(.*)$ https://%{literal("%")}{HTTP_HOST}$1 [R=301,L]
     request_headers_ssl:
       - 'set X-Forwarded-Proto "https"'
+
+infra::profile::infrastructure::jenkins::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'
+#    listen_ip: 217.66.55.72
+    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"