BERFBB-3381 tst

diff --git a/customer/fbb-captive/common.yaml b/customer/fbb-captive/common.yaml
index 12b5e0f7eddf578e1f038bf0f592cb6d1931ecef..462724de8d0f53774f4c5c3f19bd749997fd2e1a 100644 (file)
--- a/customer/fbb-captive/common.yaml
+++ b/customer/fbb-captive/common.yaml
@@ -7,3 +7,5 @@ accounts::users:
 
 logstash::install_plugins: false
 
+apache::log_formats:
+  captive: '%h %l %u %t %>s %b \"%{literal("%")}{User-Agent}i\"'

diff --git a/customer/fbb-captive/test-web-captive-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-captive/test-web-captive-berlin-airport-de.pixelpark.net.yaml
index 96cec76dbaae8c38940324afae6f0f8d385521f5..4c2cd2ab2c4fcfd31eb5ce7e5f6418e181d7f06a 100644 (file)
--- a/customer/fbb-captive/test-web-captive-berlin-airport-de.pixelpark.net.yaml
+++ b/customer/fbb-captive/test-web-captive-berlin-airport-de.pixelpark.net.yaml
@@ -36,9 +36,6 @@ infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoS405UErGdABrTEbiT9RTT6BBAQvgrVCww76IwoVWmerISWrLe7vkX+fG9wuaeLPBGaCE1AF+TpAopn5y+7cab0JwYEpkfBTfyBff5psqymb0+OYK/rt7si6yjncdCX/YG0iHAd/I/veNQk2ZQls1FBl3Re2pFISTQUalHf812pn8vRkmuTiXIr5oxH6CbXYKyikKhVxfO0BDzOt6tGvNm6SGPSZakvsGdhwzrxY+hbMY9sGbK4Rg2LdF259F/zLKxTf+mGHX+tWKDdNnhC/6Q/mfgleObJYDgocJE6GoEM0UDAQJGDXhW3W/Zw9nilWqrng1muTEy8mLYhzdoLjNTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCVOpScmtiJKkyJ7GK25Vd7gBCaTLPmlL54qrAKp2tUdu2S]
 
-apache::log_formats:
-  captive: '%h %l %u %t %>s %b \"%{literal("%")}{User-Agent}i\"'
-
 infra::profile::apache::pp_vhosts:
   www:
     docroot: '/var/www/captive'
@@ -53,6 +50,7 @@ infra::profile::apache::pp_vhosts:
     docroot_owner: apache
     docroot_group: apache
     docroot_mode: '0775'
+    access_log_format: captive
     directories:
       - provider: 'directory'
         path: "/var/www/captive"