pixelpark update yaml

diff --git a/customer/pixelpark/cobbler01.pixelpark.net.yaml b/customer/pixelpark/cobbler01.pixelpark.net.yaml
index fd1c49e6e7e02dfa1482afa26b3a8199d5915ff8..e969d7a097d17418b60e740706b176c4bcfd9508 100644 (file)
--- a/customer/pixelpark/cobbler01.pixelpark.net.yaml
+++ b/customer/pixelpark/cobbler01.pixelpark.net.yaml
@@ -1,11 +1,30 @@
 ---
 infra::role: base
-infra::profile::apache:
-        ssl: true
-        docroot: '/var/www'
-        servername: cobbler01.pixelpark.com
-        cert_servername: 'wildcard.pixelpark.com'
-        cert_customer: 'pixelpark'
-        ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
-        ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.com-key.pem'
-        ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
+infra::additional_classes:
+  - infra::profile::apache
+
+infra::profile::apache::pp_vhosts:
+  cobbler:
+    docroot: /var/www
+    servername: cobbler01.pixelpark.com
+    cert_servername: 'wildcard.pixelpark.com'
+    cert_customer: 'pixelpark'
+    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
+    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.com-key.pem'
+    ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.com-cert.pem'
+    docroot_owner: apache
+    docroot_group: apache
+    docroot_mode: '2775'
+    rewrites:
+      - comment: 'Weiterleitung von / auf /cobbler_webui_content'
+        rewrite_cond:
+          - "%{literal('%')}{REQUEST_URI} ^(/?)"
+        rewrite_rule:
+          - '^(.*)$ https://cobbler01.pixelpark.com/cobbler_webui_content [R=301,L]'
+      - comment: 'Weiterleitung auf https'
+        rewrite_cond:
+          - '%{literal('%')}{HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^(.*)$ https://cobbler01.pixelpark.com$1 [R=301,L]'
+    setenvif_ssl:
+      - 'HTTPS on HTTPS=on'
\ No newline at end of file