From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 10 Sep 2018 15:02:13 +0000 (+0200)
Subject: Renaming parameter for a nginx vhost parameter
X-Git-Tag: v0.1.0~198
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=c2cf36544290699872175a980d5cd124f21426a7;p=pixelpark%2Fhiera.git

Renaming parameter for a nginx vhost parameter
---

diff --git a/customer/fbb-web/development.yaml b/customer/fbb-web/development.yaml
index 4a44422f..eb076522 100644
--- a/customer/fbb-web/development.yaml
+++ b/customer/fbb-web/development.yaml
@@ -104,7 +104,7 @@ infra::profile::nginx_php_fpm_server::vhosts:
         - '217.66.56.0/24'
         - '194.174.72.0/21'
       deny: 'all'
-    rewrite_to_https: true
+    ssl_redirect: true
     ssl: true
     ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
@@ -167,7 +167,7 @@ infra::profile::nginx_php_fpm_server::vhosts:
     rewrite_rules:
       - '/wp-admin$ $scheme://$host$uri/ permanent'
       - '/files/$ /index.php last'
-    rewrite_to_https: true
+    ssl_redirect: true
     ssl: true
     ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
diff --git a/customer/pixelpark/bauhaus.pixelpark.com.yaml b/customer/pixelpark/bauhaus.pixelpark.com.yaml
index 56bd81dc..8c45de4a 100644
--- a/customer/pixelpark/bauhaus.pixelpark.com.yaml
+++ b/customer/pixelpark/bauhaus.pixelpark.com.yaml
@@ -45,7 +45,6 @@ nginx::nginx_vhosts:
     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
     ssl_redirect: true
 #
 # Nexus
@@ -67,7 +66,6 @@ infra::profile::infrastructure::nexus::nginx_vhosts:
     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
     ssl_redirect: true
 infra::profile::infrastructure::nexus::version: '2.14.0'
 
@@ -109,7 +107,6 @@ infra::profile::infrastructure::sonarqube::nginx_vhosts:
     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
     ssl_redirect: true
 
 #infra::profile::infrastructure::sonarqube::plugins:
@@ -148,7 +145,6 @@ infra::profile::infrastructure::jenkins::nginx_vhosts:
     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
     ssl_redirect: true
     proxy_connect_timeout: "600"
     proxy_read_timeout: "600"
diff --git a/customer/pixelpark/dev-artifacts.pixelpark.com.yaml b/customer/pixelpark/dev-artifacts.pixelpark.com.yaml
index 6c95b092..af2226cc 100644
--- a/customer/pixelpark/dev-artifacts.pixelpark.com.yaml
+++ b/customer/pixelpark/dev-artifacts.pixelpark.com.yaml
@@ -68,7 +68,7 @@ infra::profile::infrastructure::nexus::nginx_vhosts:
     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
+    ssl_redirect: true
 
 infra::profile::infrastructure::nexus::version: '3.11.0-01'
 
diff --git a/customer/pixelpark/dev-chat.pixelpark.com.yaml b/customer/pixelpark/dev-chat.pixelpark.com.yaml
index 802b0cbb..d7dded1a 100644
--- a/customer/pixelpark/dev-chat.pixelpark.com.yaml
+++ b/customer/pixelpark/dev-chat.pixelpark.com.yaml
@@ -27,7 +27,7 @@ nginx::nginx_vhosts:
     ssl_dhparam: /etc/ssl/certs/dhparam.pem
     ssl_ciphers: 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'
     ssl_protocols: 'TLSv1.2'
-    rewrite_to_https: true
+    ssl_redirect: true
     proxy: http://rocket_chat
     add_header:
       Strict-Transport-Security: "max-age=63072000"