From 5bef115b26a557457594ee71975b46b83b3eb4a8 Mon Sep 17 00:00:00 2001 From: Stephane Lapie Date: Thu, 21 Nov 2013 12:28:55 +0900 Subject: Fixing presentation, typos and location selector - Fixed presentation (capitalization mostly) - Fixed a few typos - Fixed fieldname in apache_virtualhost.xml for location referencing - Add a comment to virtualhost config to identify locations --- config/apache_mod_security-dev/apache_balancer.xml | 22 +++++++++++----------- config/apache_mod_security-dev/apache_location.xml | 2 +- .../apache_mod_security.inc | 1 + .../apache_mod_security-dev/apache_virtualhost.xml | 6 +++--- 4 files changed, 16 insertions(+), 15 deletions(-) (limited to 'config/apache_mod_security-dev') diff --git a/config/apache_mod_security-dev/apache_balancer.xml b/config/apache_mod_security-dev/apache_balancer.xml index 015da143..5e02f9d4 100755 --- a/config/apache_mod_security-dev/apache_balancer.xml +++ b/config/apache_mod_security-dev/apache_balancer.xml @@ -112,20 +112,20 @@ - apache Reverse Peer Mappings + Apache Reverse Peer Mappings listtopic Enable enable - If this field is checked, then this server poll will be available for virtual hosts config. + If this field is checked, then this server pool will be available for Virtual Hosts configuration. checkbox Balancer name name - - example: www_site1]]> + + Example: www_site1]]> input 20 @@ -139,7 +139,7 @@ Protocol proto - + select @@ -161,40 +161,40 @@ FQDN or IP Address host - Internal site IP or Hostnamesite + Internal site IP or site hostname input 27 - port + Port port Internal site port input 5 - routeid + Route ID routeid ID to define sticky connections input 6 - weight + Weight loadfactor Server weight input 4 - ping + Ping ping Server ping test interval input 6 - ttl + TTL ttl Server ping TTL input diff --git a/config/apache_mod_security-dev/apache_location.xml b/config/apache_mod_security-dev/apache_location.xml index 315cca4c..ea957f43 100644 --- a/config/apache_mod_security-dev/apache_location.xml +++ b/config/apache_mod_security-dev/apache_location.xml @@ -104,7 +104,7 @@ balancer - lbmethod + LB Method lbmethod diff --git a/config/apache_mod_security-dev/apache_mod_security.inc b/config/apache_mod_security-dev/apache_mod_security.inc index c58210dc..31be95cf 100644 --- a/config/apache_mod_security-dev/apache_mod_security.inc +++ b/config/apache_mod_security-dev/apache_mod_security.inc @@ -582,6 +582,7 @@ EOF; foreach ($virtualhost['row'] as $be){ if ($be['location'] != "none"){ $backend=$apache_location[$be['location']]; + $vh_config.="# {$backend['name']}\n"; $vh_config.=" \n"; $vh_config.=" ProxyPass balancer://{$backend['balancer']}{$backend['backendpath']}\n"; $vh_config.=" ProxyPassReverse balancer://{$backend['balancer']}{$backend['backendpath']}\n"; diff --git a/config/apache_mod_security-dev/apache_virtualhost.xml b/config/apache_mod_security-dev/apache_virtualhost.xml index c2c4837b..747ef975 100644 --- a/config/apache_mod_security-dev/apache_virtualhost.xml +++ b/config/apache_mod_security-dev/apache_virtualhost.xml @@ -267,7 +267,7 @@ none - intermediate CA certificate(optional) + Intermediate CA certificate (optional) reverse_int_ca Select intermediate CA assigned to certificate. Not all certificates require this. select_source @@ -285,8 +285,8 @@ - Location - Server locatino + location + Server Location name name -- cgit v1.2.3