From: Andreas Gerstenberg <gerstenberg@pixelpark.com>
Date: Thu, 18 Aug 2016 08:56:59 +0000 (+0200)
Subject: aamt - syntax fixing
X-Git-Tag: v0.1.0~4261
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=76c5bc2839537e83c2b6b26d83d4a83eae713de1;p=pixelpark%2Fhiera.git

aamt - syntax fixing
---

diff --git a/customer/aamt/web-aamt-facebook.pixelpark.net.yaml b/customer/aamt/web-aamt-facebook.pixelpark.net.yaml
index 1181e2ff..7f1edf10 100644
--- a/customer/aamt/web-aamt-facebook.pixelpark.net.yaml
+++ b/customer/aamt/web-aamt-facebook.pixelpark.net.yaml
@@ -6,7 +6,8 @@ site::additional_classes:
 site::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApDFjpiMzG9XjbSh0BG4Za4fOvVE+D76NOMfekQNSoL4DX+iN0zYoAEC2YYMcCDMw994OGudYr0fIU03gkNX1DoZQMST/YnAJyEjWUWtOmChgI5Kdxva9FyMIiZhTI4sf5dCC8AHfnbN7rJMJ9L7cfCwdbRfOfLf5jXyZkYRGSXultlxRpesimNlkO+D7FZ9FteKGGkWMHalowhXYiGHPXBnPE6NNEfMLknIMqapxNhQ3SNT9jXrJd0kJtUgAsISF5BtDRA3Sc5v4+Rqd6qLLIhkNPD+/AoHKLML+vwRqbRJmmGAypjpwGinX+YbAXA5nDEdjhLDAt8ZHuoMJGe2ycDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC9kZ4oz9jCMa1zSjOdPTOTgBCNRXFzhmgnogRKgFujucug]
-    testwww: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAofP97Z6G+ImsYvMzCBbLZK3ep7/liQfxGdPqOl8LZILXWQFNn3aMSx3ytMCVRSYVKaiiV8s8ntrmzWKcThihP1u2YnzaLDsIYe1DJXatACVyRgKtszQzxz4DiBESM3pwtW6Fhsn16Y/hv256lELrgNSzJWwV/MAaEDIHcCozmWJo261gJdTgTCUe1/dx8aYjFA+oVy99PC3QmB4hCwUD5exZ+eG+XJZzGIDU/dodlAcUfhVv6uxOCuvG4bumFGe30RXIyTMMK8TLpxrE77O5/6kowV2ZTbsgkn9gY/tWHU3Zbl9aLhlQ0HUZgxpcnRHUDBClBaa3JRUhanc4DStQsDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDHYZW3VkMhRlfZYx1+O0bSgBBs4B2eIYrlDh4H21CIdg4y]
+  testserver:
+    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAofP97Z6G+ImsYvMzCBbLZK3ep7/liQfxGdPqOl8LZILXWQFNn3aMSx3ytMCVRSYVKaiiV8s8ntrmzWKcThihP1u2YnzaLDsIYe1DJXatACVyRgKtszQzxz4DiBESM3pwtW6Fhsn16Y/hv256lELrgNSzJWwV/MAaEDIHcCozmWJo261gJdTgTCUe1/dx8aYjFA+oVy99PC3QmB4hCwUD5exZ+eG+XJZzGIDU/dodlAcUfhVv6uxOCuvG4bumFGe30RXIyTMMK8TLpxrE77O5/6kowV2ZTbsgkn9gY/tWHU3Zbl9aLhlQ0HUZgxpcnRHUDBClBaa3JRUhanc4DStQsDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDHYZW3VkMhRlfZYx1+O0bSgBBs4B2eIYrlDh4H21CIdg4y]
 
 apache::mpm_module: event
 site::profile::apache::pp_vhosts:
@@ -15,7 +16,7 @@ site::profile::apache::pp_vhosts:
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-        directories:
+    directories:
       - directory_docroot:
         provider: 'directory'
         path: "/var/www/aamt-facebook"
@@ -35,13 +36,13 @@ site::profile::apache::pp_vhosts:
         auth_digest_provider: file
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'user www'
+        auth_require: 'valid-user'
   test-aamt-facebook:
     servername: test-aamt-facebook.pixelpark.net
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-        directories:
+    directories:
       - directory_docroot:
         provider: 'directory'
         path: "/var/www/test-aamt-facebook"
@@ -57,11 +58,11 @@ site::profile::apache::pp_vhosts:
         provider: location
         path: '/'
         auth_type: Digest
-        auth_name: server
+        auth_name: testserver
         auth_digest_provider: file
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'user testwww'
+        auth_require: 'valid-user'
 
 site::profile::apache_php::fpm_pool:
   aamt-facebook: