You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/02/12 15:18:09 UTC
svn commit: r909421 - in /incubator/trafficserver/traffic/trunk/proxy:
InkAPITest.cc config/cache.config config/remap.config
config/splitdns.config config/storage.config mgmt2/RecordsConfig.cc
mgmt2/web2/WebHttpRender.cc
Author: zwoop
Date: Fri Feb 12 14:18:09 2010
New Revision: 909421
URL: http://svn.apache.org/viewvc?rev=909421&view=rev
Log:
TS-160: Cleanup some Traffic Edge strings, and some examples using inktomi.com.
Review: George P.
Modified:
incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc
incubator/trafficserver/traffic/trunk/proxy/config/cache.config
incubator/trafficserver/traffic/trunk/proxy/config/remap.config
incubator/trafficserver/traffic/trunk/proxy/config/splitdns.config
incubator/trafficserver/traffic/trunk/proxy/config/storage.config
incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
Modified: incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=909421&r1=909420&r2=909421&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc Fri Feb 12 14:18:09 2010
@@ -6443,7 +6443,7 @@
int CONFIG_PARAM_INT_VALUE = 1;
char *CONFIG_PARAM_STRING_NAME = "proxy.config.product_name";
- char *CONFIG_PARAM_STRING_VALUE = "Traffic Edge";
+ char *CONFIG_PARAM_STRING_VALUE = "Traffic Server";
*pstatus = REGRESSION_TEST_INPROGRESS;
Modified: incubator/trafficserver/traffic/trunk/proxy/config/cache.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/config/cache.config?rev=909421&r1=909420&r2=909421&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/config/cache.config (original)
+++ incubator/trafficserver/traffic/trunk/proxy/config/cache.config Fri Feb 12 14:18:09 2010
@@ -48,10 +48,5 @@
#
# Examples
#
-# Revalidate all http objects from inktomi.com after 2 hours
-# dest_domain=inktomi.com scheme=http revalidate=2h
-#
-# Revalidate all ftp objects from inktomi.com after 2 days
-# dest_domain=inktomi.com scheme=ftp revalidate=2d
-#
-#
+# Revalidate all http objects from www.example.com after 2 hours
+# dest_domain=www.example.com scheme=http revalidate=2h
Modified: incubator/trafficserver/traffic/trunk/proxy/config/remap.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/config/remap.config?rev=909421&r1=909420&r2=909421&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/config/remap.config (original)
+++ incubator/trafficserver/traffic/trunk/proxy/config/remap.config Fri Feb 12 14:18:09 2010
@@ -27,11 +27,11 @@
# proxy mode so that user agents know to contact Traffic Server and not
# attempt to contact the Origin Server directly.
#
-# For example, you can set up a reverse proxy for www.inktomi.com with the
-# real content situated at server1.inktomi.com with the rules:
+# For example, you can set up a reverse proxy for www.example.com with the
+# real content situated at server1.example.com with the rules:
#
-# map http://www.inktomi.com/ http://server1.inktomi.com/
-# reverse_map http://server1.inktomi.com/ http://www.inktomi.com/
+# map http://www.example.com/ http://server1.example.com/
+# reverse_map http://server1.example.com/ http://www.example.com/
#
# Or you could permanently redirect users trying to access www.oldserver.com
# to www.newserver.com with the following rule:
Modified: incubator/trafficserver/traffic/trunk/proxy/config/splitdns.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/config/splitdns.config?rev=909421&r1=909420&r2=909421&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/config/splitdns.config (original)
+++ incubator/trafficserver/traffic/trunk/proxy/config/splitdns.config Fri Feb 12 14:18:09 2010
@@ -49,7 +49,7 @@
# will terminate the search.
#
# If a host name is not fully qualified, i.e. does not have the domain
-# specifier (ex. 'internal' instead of internal.inktomi.com'), the system
+# specifier (ex. 'internal' instead of internal.example.com'), the system
# uses the 'proxy.config.dns.splitdns.def_domain' value to append to the
# host name. If 'proxy.config.dns.splitdns.def_domain' is not set, and
# there is no rule using the primary destination specifier 'url_regex',
Modified: incubator/trafficserver/traffic/trunk/proxy/config/storage.config
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/config/storage.config?rev=909421&r1=909420&r2=909421&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/config/storage.config (original)
+++ incubator/trafficserver/traffic/trunk/proxy/config/storage.config Fri Feb 12 14:18:09 2010
@@ -55,8 +55,6 @@
# mknod /dev/raw_sdc c 162 2
# mknod /dev/raw_sdd c 162 3
#
-# IMPORTANT: make sure to chown '/dev/raw/rawN' devices to user 'inktomi'
-#
# and bind them to whatever block devices you want to use:
#
# /usr/bin/raw /dev/raw_sdb /dev/sdb
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc?rev=909421&r1=909420&r2=909421&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc Fri Feb 12 14:18:09 2010
@@ -43,12 +43,12 @@
//# System Variables
//#
//##############################################################################
- {CONFIG, "proxy.config.product_company", "", INK_STRING, "Apache Project", RU_NULL, RR_NULL, RC_NULL, NULL,
+ {CONFIG, "proxy.config.product_company", "", INK_STRING, "Apache Software Foundation", RU_NULL, RR_NULL, RC_NULL, NULL,
RA_NULL}
,
{CONFIG, "proxy.config.product_vendor", "", INK_STRING, "Apache", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.product_name", "", INK_STRING, "Traffic Edge", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
+ {CONFIG, "proxy.config.product_name", "", INK_STRING, "Traffic Server", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
{CONFIG, "proxy.config.cop_name", "", INK_STRING, "Traffic Cop", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
@@ -447,7 +447,7 @@
,
//##############################################################################
//#
- //# Inktomi Traffic Net
+ //# Traffic Net
//#
//##############################################################################
{CONFIG, "proxy.config.traffic_net.traffic_net_mode", "", INK_INT, "3", RU_REREAD, RR_NULL, RC_INT, "[0-3]", RA_NULL}
@@ -459,7 +459,7 @@
,
{CONFIG, "proxy.config.traffic_net.traffic_net_lid", "", INK_STRING, NULL, RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.traffic_net.traffic_net_server", "", INK_STRING, "sm-linux-1.inktomi.com", RU_NULL, RR_NULL,
+ {CONFIG, "proxy.config.traffic_net.traffic_net_server", "", INK_STRING, "sm-linux-1.example.com", RU_NULL, RR_NULL,
RC_NULL, NULL, RA_NULL}
,
{CONFIG, "proxy.config.traffic_net.traffic_net_port", "", INK_INT, "80", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
@@ -3298,7 +3298,7 @@
//##############################################################################
{CONFIG, "proxy.config.aaa.billing.reporting_interval", "", INK_INT, "300", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.aaa.billing.machine_name", "", INK_STRING, "wire-dev02.inktomi.com", RU_NULL, RR_NULL, RC_NULL,
+ {CONFIG, "proxy.config.aaa.billing.machine_name", "", INK_STRING, "wire-dev02.example.com", RU_NULL, RR_NULL, RC_NULL,
NULL, RA_NULL}
,
{CONFIG, "proxy.config.aaa.billing.install_directory", "", INK_STRING, "/opt/portal/6.0", RU_NULL, RR_NULL, RC_NULL,
@@ -3325,7 +3325,7 @@
,
{CONFIG, "proxy.config.aaa.radius.is_proxy", "", INK_INT, "1", RU_NULL, RR_NULL, RC_NULL, NULL, RA_NULL}
,
- {CONFIG, "proxy.config.aaa.radius.radius_server_ip", "", INK_STRING, "cachedev.inktomi.com", RU_NULL, RR_NULL,
+ {CONFIG, "proxy.config.aaa.radius.radius_server_ip", "", INK_STRING, "cachedev.example.com", RU_NULL, RR_NULL,
RC_NULL, NULL, RA_NULL}
,
{CONFIG, "proxy.config.aaa.radius.radius_server_auth_port", "", INK_INT, "1812", RU_NULL, RR_NULL, RC_NULL, NULL,
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc?rev=909421&r1=909420&r2=909421&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc Fri Feb 12 14:18:09 2010
@@ -1891,9 +1891,6 @@
static int
handle_version(WebHttpContext * whc, char *tag, char *arg)
{
- // bug 52754: For Tsunami only, need to hack in Traffic Edge
- // version "1.5.0" for the web UI; NEED TO REMOVE for post-tsunami release
- //whc->response_bdy->copyFrom(appVersionInfo.VersionStr, strlen(appVersionInfo.VersionStr));
whc->response_bdy->copyFrom(PACKAGE_VERSION, strlen(PACKAGE_VERSION));
return WEB_HTTP_ERR_OKAY;
}