fbb-api - add HTTP Auth for swagger documentation

diff --git a/customer/fbb-api/test.yaml b/customer/fbb-api/test.yaml
index 6486ed2e2aa59e2f879c53b7d5327073c244cafb..fd3a6c8e2ee4169492e50cc28a80d84d67fcfb98 100644 (file)
--- a/customer/fbb-api/test.yaml
+++ b/customer/fbb-api/test.yaml
@@ -5,6 +5,10 @@ infra::additional_classes:
   - logstash
   - apache::mod::remoteip
 
+infra::profile::apache::htdigest:
+  server:
+    documentation: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAjjWCb5Bx31SSnPIc9U1ncx7WVwUYEIyjgMY6rShlfgy2GaIvT+f2XEtV50h6fnjOy0MT05HGXHnKPMstKVtE4g2GvqEEq2TRSGu+3kGw6ddz/9RtgH9kNMdH5ToPuYp3BdzQ+0qzCMW3KxbsUqVJMQZ5UHa3Yko5Mv0RGYZKUZmk7Cu99km/GNxQ4rMeCg9q8WNG6tUQwX2U1q4eJ1F8qaVCqtHB7yd980lv4EHkaOMaxu2Rv2szYcqc+rI7A30twV3Kc2V2r2WsRKykcYNfAIhoKf68CtRNWBqfxo7fH4gJ4WhnS+tRQId2o6GdmqqXLRZgSIKC4Ks/QgnonS6HFjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCLrXCL6eAaQwvZhT53S3/IgCDoqXai/ZTjKlCjuWgPjw59atA5PTanDltCPyB51bmfcQ==]
+
 accounts::users:
   markus.baumann:
     apply: true

diff --git a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
index 11f35dde981665667092056bbe0255d598b81a1e..01b1d9b6a53fc4d34b0537807841b2f3b428afef 100644 (file)
--- a/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api01-fbb.pixelpark.net.yaml
@@ -1,8 +1,4 @@
 ---
-infra::profile::apache::htdigest:
-  server:
-    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAi7B5vSvLZSBDcOlVym8Mn0yOKPvW6EG9cNIihJTLNYTTuT4zNIKrrYqfacgpjwqsWuu18dNfneh8wZRaf9/QccZ+HIYTV7a/0tKJLcGhE+5Ltm1OJ+CBrB/mVoz1YVWS6OTQoK0gsTMLYlH5psvdpuWVkwudV1b56WCa/TL5iJqy3V+A5hbQjlQVcG2A6HHz1vyPh6gxAg6we6bc43Nmxw8cPDG+Am5H+i97b+/BVagd2pTNJu1341p7WhXcnKiRzKfHUj2YoxB2hxm1Jr9gyZoJOJP0h4o5oP1D9hUkdUiwu8TF0KPY6K7FjWN/EXX3EYqAOjm8CXJCjqmch0ajDTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAbSXchRvjLyzx3FxAqhXSVgBDnaVLim4RWrpZgLQJhA0ea]
-    hh-push: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAM0A+hkRqCY23WzNVvQzLTzScIGuWDiHekjphSe4dNOscIZ11uBOMgjgvFd0QYMXrt3LC8OwDf4q9tkqPGZOucfbOkAn6C3HWgUlpFVPaJuRay9QC0r2Lsqsf6Id9IMxwHx2T6P2DCCOadVMLZurpOWuAKcBeCvlGwwl81bP03olVNfp5tf7ZdQUQAaWw9vt/DAvectou6lhfZLG/FWQJGYwR/ylusEQvw+NbOmiLc7kyXZlzcoJR5ltPbOaEv6rUGCpYdFs+Ihyfq6eMae7Z/vt9IGRWlNwbIQlCGNXRfGOOiL0usNEgKFiLyNFv5Thg1TlGllwN3i/omOP5bBcBLDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA8i0dbTd4aXiBcz3QmAxIGgBDvWpSqQ2VIqXFpwXd3BdOb]
 
 infra::profile::cron::cronjobs:
   temp_rsync_flugdaten:
@@ -80,3 +76,13 @@ infra::profile::apache::pp_vhosts:
             - 'user hh-push'
             - 'ip 10.5.13.142 217.66.51. 10.99.1.0/24'
           enforce: all
+      - location3:
+        provider: location
+        path: '/api/v1/documentation'
+        auth_name: server
+        auth_digest_provider: file
+        auth_user_file: '/etc/httpd/htdigest'
+        require:
+          requires:
+            - 'user documentation'
+          enforce: all

diff --git a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
index 0c5452901c79e6e8eddd7b72c27fefec84e462c2..0f7efc38dc6e7ab446a63edac5fe5cfff42fc6c1 100644 (file)
--- a/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
+++ b/customer/fbb-api/tst-api02-fbb.pixelpark.net.yaml
@@ -1,9 +1,5 @@
 ---
 
-infra::profile::apache::htdigest:
-  server:
-    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApLwtQtA38osTY/7lUdvIQofSDJzSVVGCiE7m3++ZB+AnZPB0ygy4fKWig+ESSVD1fny4BFnl2WK1/E5BbFxOYkOFYNIQwEeXBTfukf4EFx8CJ4EfRGoWi2G8u/hDVS2mG6VCV7G71yg5JbDpo5riR/tLlJV6pEbgPITIRQE8DJ+a6gYy1Zs+QiWHoZpmh7ZrXR8XQMEoYOMtGig1EIHEb8t1vT5QQQiCT0JqwLzG9gdwHNf8+W42A1xNfPcZlHX5aFhUwDo+AQkn1Z5/C8Z2t44f/Sbd79D8T6UdIv+Ji98i47V1zFlbSe9DntU6yBa+pIPG+MHVPGuqoGBDOSxJFTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBYFlJNLjZNOjB+ZJfS6OLTgBBfrWwrqWzTXq2m+8Up6oj1]
-
 rabbitmq::environment_variables:
   NODENAME: 'rabbit@tst-api02-fbb.pixelpark.net'
   USE_LONGNAME: true
@@ -63,3 +59,13 @@ infra::profile::apache::pp_vhosts:
             - 'user hh-push'
             - 'ip 10.5.13.142 217.66.51. 10.99.1.0/24'
           enforce: all
+      - location3:
+        provider: location
+        path: '/api/v1/documentation'
+        auth_name: server
+        auth_digest_provider: file
+        auth_user_file: '/etc/httpd/htdigest'
+        require:
+          requires:
+            - 'user documentation'
+          enforce: all