From: Thomas Heller <thomas.heller@pixelpark.com>
Date: Fri, 24 Aug 2018 09:02:39 +0000 (+0200)
Subject: created new jenkins vhost
X-Git-Tag: v0.1.0~307^2~1
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=3f40ed6757cd01e04a7bdfb2208d6617937a8ce8;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 9ce66418..6b592caf 100644
--- a/customer/spk-jenkins/stage-services01.sfp.devops.pixelpark.net.yaml
+++ b/customer/spk-jenkins/stage-services01.sfp.devops.pixelpark.net.yaml
@@ -1,111 +1,112 @@
 ---
 infra::additional_classes:
-#  - infra::profile::apache
-#  - apache::mod::headers
-  - nginx
+  - infra::profile::apache
+  - apache::mod::headers
+#  - nginx
 
 repo::remi_php72: true
 
-#infra::profile::apache::pp_vhosts:
-#  nexus:
-#    docroot: '/srv'
-#    servername: 'stage-services01-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: /nexus, url: 'http://127.0.0.1:8081/nexus' }
-#    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'
-#    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:8082/' }
-#    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"'
-
-nginx::nginx_vhosts:
+infra::profile::apache::pp_vhosts:
+  nexus:
+    docroot: '/srv'
+    servername: 'stage-services01-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: /nexus, url: 'http://127.0.0.1:8081/nexus' }
+    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:
-    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"
+    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'
+    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:8082/' }
+    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"'
+
+#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"
+#