From 7c0fa837106a336150daf8160db3dec487795d39 Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Fri, 24 Aug 2018 10:56:51 +0200 Subject: [PATCH] created new jenkins vhost --- ...e-services01.sfp.devops.pixelpark.net.yaml | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) 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 ce9f98be..6cae6b4f 100644 --- a/customer/spk-jenkins/stage-services01.sfp.devops.pixelpark.net.yaml +++ b/customer/spk-jenkins/stage-services01.sfp.devops.pixelpark.net.yaml @@ -1,6 +1,6 @@ --- infra::additional_classes: - - infra::profile::apache +# - infra::profile::apache - apache::mod::headers - nginx @@ -35,34 +35,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' -- 2.39.5