]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
fix lint for emperra
authorRobert Waffen <robert.waffen@pixelpark.com>
Fri, 14 Sep 2018 15:06:07 +0000 (17:06 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Tue, 18 Sep 2018 13:50:16 +0000 (15:50 +0200)
customer/emperra/common.yaml
customer/emperra/portal-esysta-com.pixelpark.net.yaml
customer/emperra/test-portal-esysta-com.pixelpark.net.yaml

index e1fd4ef34d6039840cf6b54bff92e449ca213212..18691fdf09b3ae2b11416fe7988bc0222d71c442 100644 (file)
@@ -1,4 +1,2 @@
 ---
-
 logstash::install_plugins: false
-
index eb569c63d1901bfdfac1936d9fb684322f3fa491..fa2ce1704041d6ba852bd4efed27989f4136558b 100644 (file)
@@ -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
index 0309a3414273dd4fef3bb30f4ea0309941602ded..ffb26d6a62d82b257e6f67f7a47b949c76cadc8a 100644 (file)
@@ -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