From 7e9fd1e2fce4cd4b4d5c437aec834de794d718d0 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 14 Sep 2018 17:06:07 +0200 Subject: [PATCH] fix lint for emperra --- customer/emperra/common.yaml | 2 - .../portal-esysta-com.pixelpark.net.yaml | 8 +-- .../test-portal-esysta-com.pixelpark.net.yaml | 51 +++++++------------ 3 files changed, 22 insertions(+), 39 deletions(-) diff --git a/customer/emperra/common.yaml b/customer/emperra/common.yaml index e1fd4ef3..18691fdf 100644 --- a/customer/emperra/common.yaml +++ b/customer/emperra/common.yaml @@ -1,4 +1,2 @@ --- - logstash::install_plugins: false - diff --git a/customer/emperra/portal-esysta-com.pixelpark.net.yaml b/customer/emperra/portal-esysta-com.pixelpark.net.yaml index eb569c63..fa2ce170 100644 --- a/customer/emperra/portal-esysta-com.pixelpark.net.yaml +++ b/customer/emperra/portal-esysta-com.pixelpark.net.yaml @@ -397,8 +397,8 @@ infra::profile::apache::vhosts: ip: 77.74.237.36 port: 443 ssl: true - #cert_servername: 'esysta.com' - #cert_customer: 'emperra' + # cert_servername: 'esysta.com' + # cert_customer: 'emperra' ssl_cert: /etc/pki/tls/certs/portal.esysta.com-cert.pem ssl_chain: /etc/pki/tls/certs/portal.esysta.com-cert.pem ssl_key: /etc/pki/tls/private/portal.esysta.com-key.pem @@ -471,8 +471,8 @@ infra::profile::apache::vhosts: ip: 77.74.237.38 port: 443 ssl: true - #cert_servername: 'esysta.com' - #cert_customer: 'emperra' + # cert_servername: 'esysta.com' + # cert_customer: 'emperra' ssl_cert: /etc/pki/tls/certs/portal.esysta.com-cert.pem ssl_chain: /etc/pki/tls/certs/portal.esysta.com-cert.pem ssl_key: /etc/pki/tls/private/portal.esysta.com-key.pem diff --git a/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml b/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml index 0309a341..ffb26d6a 100644 --- a/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml +++ b/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml @@ -87,19 +87,6 @@ accounts::users: - POSTGRES - JRNLDIALOG - JRNLDIALOGNOSSL - neumann: - apply: true - sudo: true - group: emperra - groups: - - dialog - sudo_cmds: - - DIALOG - - DIALOGNOSSL - - APACHE - - POSTGRES - - JRNLDIALOG - - JRNLDIALOGNOSSL herzog: apply: true sudo: true @@ -206,8 +193,8 @@ infra::profile::apache::vhosts: ip: 77.74.238.70 port: 443 ssl: true - #cert_servername: 'wildcard.pixelpark.net' - #cert_customer: 'pixelpark' + # cert_servername: 'wildcard.pixelpark.net' + # cert_customer: 'pixelpark' ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem @@ -250,8 +237,8 @@ infra::profile::apache::vhosts: ip: 77.74.238.70 port: 443 ssl: true - #cert_servername: 'wildcard.pixelpark.net' - #cert_customer: 'pixelpark' + # cert_servername: 'wildcard.pixelpark.net' + # cert_customer: 'pixelpark' ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem @@ -295,8 +282,8 @@ infra::profile::apache::vhosts: ip: 77.74.238.70 port: 443 ssl: true - #cert_servername: 'wildcard.pixelpark.net' - #cert_customer: 'pixelpark' + # cert_servername: 'wildcard.pixelpark.net' + # cert_customer: 'pixelpark' ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem @@ -340,8 +327,8 @@ infra::profile::apache::vhosts: ip: 77.74.238.70 port: 443 ssl: true - #cert_servername: 'wildcard.pixelpark.net' - #cert_customer: 'pixelpark' + # cert_servername: 'wildcard.pixelpark.net' + # cert_customer: 'pixelpark' ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem @@ -400,8 +387,8 @@ infra::profile::apache::vhosts: ip: 77.74.238.70 port: 443 ssl: true - #cert_servername: 'wildcard.pixelpark.net' - #cert_customer: 'pixelpark' + # cert_servername: 'wildcard.pixelpark.net' + # cert_customer: 'pixelpark' ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem @@ -459,8 +446,8 @@ infra::profile::apache::vhosts: ip: 77.74.238.70 port: 443 ssl: true - #cert_servername: 'wildcard.pixelpark.net' - #cert_customer: 'pixelpark' + # cert_servername: 'wildcard.pixelpark.net' + # cert_customer: 'pixelpark' ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem @@ -509,8 +496,6 @@ infra::profile::apache::vhosts: SetEnvIfNoCase ^X_VERSION_CODE$ ^(.*)$ fix_version_code=$1 RequestHeader set X-VERSION-CODE %%{ich-trickse}{fix_version_code}e env=fix_version_code - - mitarbeiter-develop: servername: mitarbeiter-develop-esysta-com.pixelpark.net docroot: '/var/www/esysta/develop' @@ -520,8 +505,8 @@ infra::profile::apache::vhosts: ip: 77.74.238.70 port: 443 ssl: true - #cert_servername: 'wildcard.pixelpark.net' - #cert_customer: 'pixelpark' + # cert_servername: 'wildcard.pixelpark.net' + # cert_customer: 'pixelpark' ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem @@ -564,8 +549,8 @@ infra::profile::apache::vhosts: ip: 77.74.238.70 port: 443 ssl: true - #cert_servername: 'wildcard.pixelpark.net' - #cert_customer: 'pixelpark' + # cert_servername: 'wildcard.pixelpark.net' + # cert_customer: 'pixelpark' ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem @@ -607,8 +592,8 @@ infra::profile::apache::vhosts: ip: 77.74.238.70 port: 443 ssl: true - #cert_servername: 'wildcard.pixelpark.net' - #cert_customer: 'pixelpark' + # cert_servername: 'wildcard.pixelpark.net' + # cert_customer: 'pixelpark' ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem -- 2.39.5