From 9b9db429950d9568d99057ef77ba7eabe022a5cc Mon Sep 17 00:00:00 2001 From: Thomas Dalichow Date: Tue, 14 Aug 2018 16:33:17 +0200 Subject: [PATCH] fbb-api - remoteip config for PRD (fix IPs) --- customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml | 4 ++-- customer/fbb-api/prd-api02-fbb.pixelpark.net.yaml | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml b/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml index c3e8c61a..214c0039 100644 --- a/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml +++ b/customer/fbb-api/prd-api01-fbb.pixelpark.net.yaml @@ -49,7 +49,7 @@ infra::profile::apache::pp_vhosts: requires: # ACHTUNG! RequireAll! - 'user hh-push' - - 'ip 10.5.13.144 217.66.51. 10.99.1.0/24' + - 'ip 10.5.13.0/24 172.28.0.128/25 217.66.51. 10.99.1.0/24' enforce: all - location2: provider: location @@ -61,5 +61,5 @@ infra::profile::apache::pp_vhosts: requires: # ACHTUNG! RequireAll! - 'user hh-push' - - 'ip 10.5.13.144 217.66.51. 10.99.1.0/24' + - 'ip 10.5.13.0/24 172.28.0.128/25 217.66.51. 10.99.1.0/24' enforce: all diff --git a/customer/fbb-api/prd-api02-fbb.pixelpark.net.yaml b/customer/fbb-api/prd-api02-fbb.pixelpark.net.yaml index 1394b5a6..194e405f 100644 --- a/customer/fbb-api/prd-api02-fbb.pixelpark.net.yaml +++ b/customer/fbb-api/prd-api02-fbb.pixelpark.net.yaml @@ -46,12 +46,9 @@ infra::profile::apache::pp_vhosts: auth_user_file: '/etc/httpd/conf/basic-auth-hh' require: requires: + # ACHTUNG! RequireAll! - 'user hh-push' - # IP Hamburg - - 'ip 10.5.13.144' - # Pixelpark Admin-Netz - 10.99.1.10/24 ist eine Umsetzung unseres Admin-Netzes (Gruende bitte im Netzwerk erfragen *magic*) - - 'ip 217.66.51.' - - 'ip 10.99.1.0/24' + - 'ip 10.5.13.0/24 172.28.0.128/25 217.66.51. 10.99.1.0/24' enforce: all - location2: provider: location @@ -61,10 +58,7 @@ infra::profile::apache::pp_vhosts: auth_user_file: '/etc/httpd/conf/basic-auth-hh' require: requires: + # ACHTUNG! RequireAll! - 'user hh-push' - # IP Hamburg - - 'ip 10.5.13.144' - # Pixelpark Admin-Netz - 10.99.1.10/24 ist eine Umsetzung unseres Admin-Netzes (Gruende bitte im Netzwerk erfragen *magic*) - - 'ip 217.66.51.' - - 'ip 10.99.1.0/24' + - 'ip 10.5.13.0/24 172.28.0.128/25 217.66.51. 10.99.1.0/24' enforce: all -- 2.39.5