From f9e88e152dd5ed607427d9f849e5cadc0d0203d7 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 14 Sep 2018 17:06:12 +0200 Subject: [PATCH] fix lint for pixelpark-puppet --- customer/pixelpark-puppet/foreman02.pixelpark.com.yaml | 2 +- customer/pixelpark-puppet/messageq01.pixelpark.com.yaml | 6 +++--- customer/pixelpark-puppet/puppetca01.pixelpark.com.yaml | 1 - customer/pixelpark-puppet/puppetdb01.pixelpark.com.yaml | 3 +-- customer/pixelpark-puppet/puppetmaster01.pixelpark.com.yaml | 1 - customer/pixelpark-puppet/puppetmaster02.pixelpark.com.yaml | 1 - 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/customer/pixelpark-puppet/foreman02.pixelpark.com.yaml b/customer/pixelpark-puppet/foreman02.pixelpark.com.yaml index 124b350c..aa3f5f61 100644 --- a/customer/pixelpark-puppet/foreman02.pixelpark.com.yaml +++ b/customer/pixelpark-puppet/foreman02.pixelpark.com.yaml @@ -7,7 +7,7 @@ infra::additional_classes: - apache::mod::passenger apache::mod::passenger::passenger_pool_idle_time: 600 -#apache::mod::passenger::passenger_high_performance: 'On' +# apache::mod::passenger::passenger_high_performance: 'On' infra::profile::apache::pp_vhosts: foreman: diff --git a/customer/pixelpark-puppet/messageq01.pixelpark.com.yaml b/customer/pixelpark-puppet/messageq01.pixelpark.com.yaml index 253b97ae..e239189a 100644 --- a/customer/pixelpark-puppet/messageq01.pixelpark.com.yaml +++ b/customer/pixelpark-puppet/messageq01.pixelpark.com.yaml @@ -23,9 +23,9 @@ rabbitmq::management_ssl: false rabbitmq::config_variables: reverse_dns_lookups: true rabbitmq::ssl_versions: ['tlsv1.2', 'tlsv1.1', 'tlsv1'] -#rabbitmq::ssl_cert: /etc/rabbitmq/ssl/wildcard.pixelpark.com-cert.pem -#rabbitmq::ssl_key: /etc/rabbitmq/ssl/wildcard.pixelpark.com-key.pem -#rabbitmq::ssl_cacert: /etc/rabbitmq/ssl/wildcard.pixelpark.com-ca.pem +# rabbitmq::ssl_cert: /etc/rabbitmq/ssl/wildcard.pixelpark.com-cert.pem +# rabbitmq::ssl_key: /etc/rabbitmq/ssl/wildcard.pixelpark.com-key.pem +# rabbitmq::ssl_cacert: /etc/rabbitmq/ssl/wildcard.pixelpark.com-ca.pem rabbitmq::ssl_cert: "/etc/puppetlabs/puppet/ssl/certs/%{fqdn}.pem" rabbitmq::ssl_key: "/etc/puppetlabs/puppet/ssl/private_keys/%{fqdn}.pem" diff --git a/customer/pixelpark-puppet/puppetca01.pixelpark.com.yaml b/customer/pixelpark-puppet/puppetca01.pixelpark.com.yaml index c90ec476..3b0442d3 100644 --- a/customer/pixelpark-puppet/puppetca01.pixelpark.com.yaml +++ b/customer/pixelpark-puppet/puppetca01.pixelpark.com.yaml @@ -1,3 +1,2 @@ --- infra::role: base - diff --git a/customer/pixelpark-puppet/puppetdb01.pixelpark.com.yaml b/customer/pixelpark-puppet/puppetdb01.pixelpark.com.yaml index 6edd467d..155bf7b8 100644 --- a/customer/pixelpark-puppet/puppetdb01.pixelpark.com.yaml +++ b/customer/pixelpark-puppet/puppetdb01.pixelpark.com.yaml @@ -36,7 +36,7 @@ infra::profile::apache::pp_vhosts: group: apache processes: 2 threads: 5 - #display-name: '%{literal("%")}{GLOBAL}' + # display-name: '%{literal("%")}{GLOBAL}' display-name: '(wsgi:puppetboard)' maximum-requests: 10000 wsgi_script_aliases: @@ -73,4 +73,3 @@ infra::profile::apache::pp_vhosts: - '%%{ich-trickse}{HTTPS} !=on' rewrite_rule: - ^(.*)$ https://%%{ich-trickse}{HTTP_HOST}$1 [R=301,L] - diff --git a/customer/pixelpark-puppet/puppetmaster01.pixelpark.com.yaml b/customer/pixelpark-puppet/puppetmaster01.pixelpark.com.yaml index c19dd971..40e9eed5 100644 --- a/customer/pixelpark-puppet/puppetmaster01.pixelpark.com.yaml +++ b/customer/pixelpark-puppet/puppetmaster01.pixelpark.com.yaml @@ -43,4 +43,3 @@ infra::profile::apache::pp_vhosts: - '%%{ich-trickse}{HTTPS} !=on' rewrite_rule: - '(.*) https://%{literal("%")}{HTTP_HOST}%{literal("%")}{REQUEST_URI} [R=301,L]' - diff --git a/customer/pixelpark-puppet/puppetmaster02.pixelpark.com.yaml b/customer/pixelpark-puppet/puppetmaster02.pixelpark.com.yaml index 44daad76..02a63ce5 100644 --- a/customer/pixelpark-puppet/puppetmaster02.pixelpark.com.yaml +++ b/customer/pixelpark-puppet/puppetmaster02.pixelpark.com.yaml @@ -39,4 +39,3 @@ infra::profile::apache::pp_vhosts: - '%%{ich-trickse}{HTTPS} !=on' rewrite_rule: - '(.*) https://%{literal("%")}{HTTP_HOST}%{literal("%")}{REQUEST_URI} [R=301,L]' - -- 2.39.5