From e290928a88419d440eafc432b790e2cc58efaf3b Mon Sep 17 00:00:00 2001 From: sambufe Date: Thu, 20 Jul 2017 16:46:20 +0200 Subject: [PATCH] FBBKERNSERV-305 mod_remote_ip test --- customer/fbb-orat/test.yaml | 4 ++-- customer/fbb-www/test.yaml | 15 ++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/customer/fbb-orat/test.yaml b/customer/fbb-orat/test.yaml index 7c0e87fa..616739d6 100644 --- a/customer/fbb-orat/test.yaml +++ b/customer/fbb-orat/test.yaml @@ -32,8 +32,8 @@ sudo::configs: jenkins ALL=(apache) NOPASSWD: ALL apache::mod::remoteip::proxy_ips: - - '192.168.166.252' - - '192.168.166.253' + - '192.168.168.253' + - '192.168.168.254' infra::profile::wordpress::projects: orat: diff --git a/customer/fbb-www/test.yaml b/customer/fbb-www/test.yaml index 83b4ef7d..ba774c4d 100644 --- a/customer/fbb-www/test.yaml +++ b/customer/fbb-www/test.yaml @@ -6,6 +6,7 @@ infra::additional_classes: - infra::profile::postfix - infra::profile::cron - infra::profile::clamav + - apache::mod::remoteip accounts::users: #pixelpark @@ -151,6 +152,10 @@ sudo::configs: florian.dorrer ALL=(unitb.cron) NOPASSWD: ALL felix.maier ALL=(unitb.cron) NOPASSWD: ALL +apache::mod::remoteip::proxy_ips: + - 192.168.65.253 + - 192.168.65.254 + infra::profile::cron::cronjobs: flugplan-import: command: '/bin/bash /opt/app/web_alt/flugplan/SH_Sources/poll.sh >> /var/log/unitb/flugplan-import.log 2>> /var/log/unitb/flugplan-import.log' @@ -284,7 +289,7 @@ infra::profile::apache::pp_vhosts: ssl: false docroot_owner: apache docroot_group: apache - access_log_format: lb_combined + access_log_format: remote_combined setenvif: - 'HTTPS on X-Forwarded-Proto=https' - 'HTTPS on HTTPS=on' @@ -313,7 +318,7 @@ infra::profile::apache::pp_vhosts: docroot_owner: web docroot_group: fbb docroot_mode: '0775' - access_log_format: lb_combined + access_log_format: remote_combined setenvif: - 'HTTPS on X-Forwarded-Proto=https' - 'HTTPS on HTTPS=on' @@ -341,7 +346,7 @@ infra::profile::apache::pp_vhosts: ssl: false docroot_owner: presse.upload docroot_group: fbb - access_log_format: lb_combined + access_log_format: remote_combined setenvif: - 'HTTPS on X-Forwarded-Proto=https' - 'HTTPS on HTTPS=on' @@ -374,7 +379,7 @@ infra::profile::apache::pp_vhosts: docroot_group: apache #wird benoetigt weil die docroot auf einen symlink zeigt manage_docroot: false - access_log_format: lb_combined + access_log_format: remote_combined setenvif: - 'HTTPS on X-Forwarded-Proto=https' - 'HTTPS on HTTPS=on' @@ -407,7 +412,7 @@ infra::profile::apache::pp_vhosts: #wird benoetigt weil die docroot auf einen symlink zeigt manage_docroot: false default_vhost: true - access_log_format: lb_combined + access_log_format: remote_combined setenv: - AIRLINE_DATA /www/data/fiona/app/online/docs/_airlines/index.php - POI_CMS_EXPORT_FILE /www/data/fiona/app/online/docs/poiExport/index.php -- 2.39.5