]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
added ssl cert + https redirect
authorThomas Heller <thomas.heller@pixelpark.com>
Tue, 12 Jun 2018 11:04:23 +0000 (13:04 +0200)
committerThomas Heller <thomas.heller@pixelpark.com>
Tue, 12 Jun 2018 11:04:23 +0000 (13:04 +0200)
customer/bmas-sozialrat/www-sozialrat-de.pixelpark.net.yaml

index 480ee41011fa6c3112463e1b40c36a1217589335..3e8d65b43ebfdaa3300a88c7a813871ba52003e5 100644 (file)
@@ -42,10 +42,8 @@ infra::profile::apache_php::pp_vhosts:
         allow_override:
           - FileInfo
           - 'Options=MultiViews,Indexes,FollowSymLinks'
-    rewrites:
+    rewrites_non_ssl:
       - comment: 'http to https'
-        rewrite_cond:
-          - '%%{ich-trickse}{HTTPS} !=on'
         rewrite_rule:
           - '(.*)$ https://www.sozialbeirat.de$1 [R=301,L]'
   generationenvertrag:
@@ -73,14 +71,12 @@ infra::profile::apache_php::pp_vhosts:
         allow_override:
           - FileInfo
           - 'Options=MultiViews,Indexes,FollowSymLinks'
-    rewrites:
+    rewrites_non_ssl:
       - comment: 'SERVICEDESK-2114'
         rewrite_cond:
           - '%%{ich-trickse}{HTTP_HOST} ^(www\.)?xn--verlsslicher-generationenvertrag-oyc\.de$'
         rewrite_rule:
           - '^(.*)$ http://www.verlaesslicher-generationenvertrag.de [R=301,L]'
       - comment: 'Alles auf https umleiten'
-        rewrite_cond:
-          - '%%{ich-trickse}{HTTPS} !=on'
         rewrite_rule:
           - '(.*)$ https://www.verlaesslicher-generationenvertrag.de$1 [R=301,L]'