Permalink
Browse files

TS-118: This patch 'TS118_patch3.diff' addresses the relative path is…

…sue for base SSL cert paths. This patch also sets the defaults back to relative paths. Also converted 'conf/yts' -> 'etc/trafficserver' throughout the code base.

Review: Leif H.
Tested: ubuntu904


git-svn-id: https://svn.apache.org/repos/asf/incubator/trafficserver/traffic/trunk@906361 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
george5p committed Feb 4, 2010
1 parent 6a130b2 commit c810e89026bcd4707dc2fe7b2d349154c5e5f276
Showing with 149 additions and 154 deletions.
  1. +1 −1 example/blacklist-1/blacklist.cgi
  2. +1 −1 example/thread-pool/README.txt
  3. +2 −2 example/thread-pool/TESTPLAN.txt
  4. +2 −2 iocore/hostdb/HostDB.cc
  5. +2 −2 iocore/net/NetConfig.cc
  6. +24 −30 iocore/net/SSLConfig.cc
  7. +1 −1 libinktomi++/SafeShell.cc
  8. +2 −2 proxy/Initialize.cc
  9. +3 −3 proxy/InkAPITest.cc
  10. +0 −1 proxy/Main.cc
  11. +3 −3 proxy/Main.h
  12. +2 −2 proxy/Raf.cc
  13. +2 −2 proxy/config/plugin.config
  14. +6 −6 proxy/config/records.config.in
  15. +4 −2 proxy/config/storage.config
  16. +1 −1 proxy/logging/LogFile.cc
  17. +3 −3 proxy/logging/LogStandalone.cc
  18. +2 −2 proxy/mgmt2/Main.cc
  19. +3 −3 proxy/mgmt2/Main.h
  20. +1 −1 proxy/mgmt2/ProcessManager.cc
  21. +19 −19 proxy/mgmt2/RecordsConfig.cc
  22. +1 −1 proxy/mgmt2/api2/CoreAPI.cc
  23. +1 −1 proxy/mgmt2/api2/INKMgmtAPI.cc
  24. +1 −1 proxy/mgmt2/api2/MgmtPlugin.cc
  25. +2 −2 proxy/mgmt2/api2/include/INKMgmtAPI.h
  26. +4 −4 proxy/mgmt2/api2/remote/APITestCliRemote.cc
  27. +1 −1 proxy/mgmt2/api2/remote/RemoteTestOem.cc
  28. +1 −1 proxy/mgmt2/cli/CLI.cc
  29. +1 −1 proxy/mgmt2/cli/CLImonitor.cc
  30. +3 −3 proxy/mgmt2/cli/clientCLI.h
  31. +3 −3 proxy/mgmt2/cli2/CliMgmtUtils.h
  32. +1 −1 proxy/mgmt2/cli2/cli_scriptpaths.h
  33. +4 −4 proxy/mgmt2/cli2/cli_sethostname_solaris.tcl
  34. +1 −1 proxy/mgmt2/cli2/script_configs.sh
  35. +1 −1 proxy/mgmt2/cli2/script_configs.tcl
  36. +4 −4 proxy/mgmt2/cop/TrafficCop.cc
  37. +5 −5 proxy/mgmt2/html2/agent-installer/installer.cgi
  38. +1 −1 proxy/mgmt2/tools/ConfigAPI.cc
  39. +1 −1 proxy/mgmt2/tools/NetConfig.cc
  40. +2 −2 proxy/mgmt2/tools/SysAPI.cc
  41. +1 −1 proxy/mgmt2/tools/TimeConfig.cc
  42. +2 −2 proxy/mgmt2/web2/MgmtRaf.cc
  43. +2 −2 proxy/mgmt2/web2/WebHttp.cc
  44. +5 −5 proxy/mgmt2/web2/WebHttpRender.cc
  45. +3 −3 proxy/regression.pl
  46. +13 −13 proxy/ts-instantiate.pl
  47. +1 −1 test/SDKtest/plugin-o-matic
@@ -28,7 +28,7 @@
# CHANGE: specify the installed directory of traffic server here
$ts_dir = "/home/inktomi/ts-3.5";
-$blacklist_file = "$ts_dir/conf/yts/plugins/blacklist.txt";
+$blacklist_file = "$ts_dir/etc/trafficserver/plugins/blacklist.txt";
sub parse_form {
local($pairs, $buffer);
@@ -95,7 +95,7 @@ Plugin Installation
The files to include must be located under the directory <plugin_path>/include
<plugin_path> is the path where the psi.so library is located
- (by default $TS_HOME/conf/yts/plugins)
+ (by default $TS_HOME/etc/trafficserver/plugins)
Start TS as usual. Now any HTTP response with the X-Psi headers will be processed
by the PSI plugin.
@@ -35,7 +35,7 @@ Tests setup:
------------
- Update plugin.config to add the psi plugin
- Generate the include files using the gen_inc.sh tool in thread-pool/include
- - Copy the include files into $TS_HOME/conf/yts/plugins/include
+ - Copy the include files into $TS_HOME/etc/trafficserver/plugins/include
- Start TS
- Start SynTest
@@ -61,7 +61,7 @@ Tests setup:
TS setup:
- Update plugin.config to add the psi plugin
- Generate the include files using the gen_inc.sh tool in thread-pool/include
- - Copy the include files into $TS_HOME/conf/yts/plugins/include
+ - Copy the include files into $TS_HOME/etc/trafficserver/plugins/include
- Start TS
SDKTest setup (Refer to SDKTest manual for detailed instructions):
View
@@ -26,7 +26,7 @@
#include "P_HostDB.h"
#ifndef NON_MODULAR
-//char system_config_directory[512] = "conf/yts";
+//char system_config_directory[512] = "etc/trafficserver";
#else
#include "Show.h"
#endif
@@ -2366,7 +2366,7 @@ ink_hostdb_init(ModuleVersion v)
IOCORE_RegisterConfigInteger(RECT_CONFIG, "proxy.config.hostdb.size", 200000, RECU_DYNAMIC, RECC_NULL, NULL);
IOCORE_RegisterConfigString(RECT_CONFIG,
- "proxy.config.hostdb.storage_path", "conf/yts/internal", RECU_DYNAMIC, RECC_NULL, NULL);
+ "proxy.config.hostdb.storage_path", "etc/trafficserver/internal", RECU_DYNAMIC, RECC_NULL, NULL);
IOCORE_RegisterConfigInteger(RECT_CONFIG,
"proxy.config.hostdb.storage_size", 33554432, RECU_DYNAMIC, RECC_NULL, NULL);
View
@@ -65,7 +65,7 @@ char *net_config_serverCertFilename = "server.pem";
// # This is the path that will be used for both single and
// # multi cert systems.
-char *net_config_serverCertRelativePath = "/conf/yts";
+char *net_config_serverCertRelativePath = "etc/trafficserver";
// # Fill in private key file and path only if the server's
// # private key is not contained in the server certificate file.
@@ -87,7 +87,7 @@ char *net_config_CACertRelativePath = NULL;
int net_config_clientVerify = 0;
char *net_config_ssl_client_cert_filename = NULL;
-char *net_config_ssl_client_cert_path = "/conf/yts";
+char *net_config_ssl_client_cert_path = "etc/trafficserver";
// # Fill in private key file and path only if the client's
// # private key is not contained in the client certificate file.
View
@@ -41,11 +41,6 @@ bool
SslConfig
sslTerminationConfig;
-#ifdef NET_FIXME
-#define system_base_install "."
-#define system_config_directory "conf/yts"
-#endif
-
#ifndef USE_CONFIG_PROCESSOR
SslConfigParams *
SslConfig::ssl_config_params;
@@ -162,7 +157,7 @@ SslConfigParams::initialize()
char *clientCACertRelativePath = NULL;
char *multicert_config_file = NULL;
- int system_base_install_len = strlen(system_base_install) + 1;
+ int system_root_dir_len = strlen(system_root_dir) + 1;
int system_config_directory_len = strlen(system_config_directory) + 1;
int ssl_mode = SSL_TERM_MODE_NONE;
int ret_val = 0;
@@ -186,8 +181,8 @@ SslConfigParams::initialize()
/* if ssl is enabled and we require an accelerator */
if ((termMode & SSL_TERM_MODE_BOTH) && (ssl_accelerator_required & SSL_ACCELERATOR_REQ_BOTH)) {
if (system(NULL)) {
- ret_val = system("/home/trafficserver/bin/openssl_accelerated >/dev/null 2>&1");
- Debug("ssl_accelerator_required", "/home/trafficserver/bin/openssl_accelerated returned %d|%d|(%d)", ret_val,
+ ret_val = system("bin/openssl_accelerated >/dev/null 2>&1");
+ Debug("ssl_accelerator_required", "bin/openssl_accelerated returned %d|%d|(%d)", ret_val,
WIFEXITED(ret_val), WEXITSTATUS(ret_val));
if (WEXITSTATUS(ret_val) != 1) {
if (ssl_accelerator_required & SSL_ACCELERATOR_REQ_MEAN) {
@@ -196,7 +191,7 @@ SslConfigParams::initialize()
exit(-1);
} else {
Error
- ("You asked to have ssl acceleration only if you have an accelerator card present, but you don't appear to have one [what does /home/trafficserver/bin/openssl_accelerated return?]");
+ ("You asked to have ssl acceleration only if you have an accelerator card present, but you don't appear to have one [what does bin/openssl_accelerated return?]");
ssl_mode = 0;
termMode = (SSL_TERMINATION_MODE) ssl_mode;
}
@@ -269,17 +264,16 @@ SslConfigParams::initialize()
IOCORE_ReadConfigString(serverCertRelativePath, "proxy.config.ssl.server.cert.path", PATH_NAME_MAX);
const size_t serverCertPathSize =
- system_base_install_len + strlen(serverCertRelativePath) + strlen(serverCertFilename) + 1;
+ system_root_dir_len + strlen(serverCertRelativePath) + strlen(serverCertFilename) + 2;
serverCertPath = (char *) xmalloc(serverCertPathSize);
- const size_t serverCertPathOnlySize = system_base_install_len + strlen(serverCertRelativePath) + 5;
+ const size_t serverCertPathOnlySize = system_root_dir_len + strlen(serverCertRelativePath) + 5;
serverCertPathOnly = (char *) xmalloc(serverCertPathOnlySize);
- ink_strncpy(serverCertPath, system_base_install, serverCertPathSize);
- strncat(serverCertPath, serverCertRelativePath, (serverCertPathSize - strlen(serverCertPath) - 1));
- strncat(serverCertPath, "/", (serverCertPathSize - strlen(serverCertPath) - 1));
- ink_strncpy(serverCertPathOnly, (const char *) serverCertPath, serverCertPathOnlySize);
- strncat(serverCertPath, serverCertFilename, (serverCertPathSize - strlen(serverCertPath) - 1));
+ snprintf(serverCertPathOnly, serverCertPathOnlySize, "%s%s%s%s",
+ system_root_dir, DIR_SEP,serverCertRelativePath,DIR_SEP);
+ snprintf(serverCertPath, serverCertPathSize,
+ "%s%s",serverCertPathOnly, serverCertFilename);
#ifdef _WIN32
i = 0;
@@ -346,10 +340,10 @@ SslConfigParams::initialize()
if (ssl_server_private_key_filename != NULL) {
const size_t serverKeyPathSize =
- system_base_install_len + strlen(ssl_server_private_key_path) + strlen(ssl_server_private_key_filename) + 1;
+ system_root_dir_len + strlen(ssl_server_private_key_path) + strlen(ssl_server_private_key_filename) + 1;
serverKeyPath = (char *) xmalloc(serverKeyPathSize);
- ink_strncpy(serverKeyPath, system_base_install, serverKeyPathSize);
+ ink_strncpy(serverKeyPath, system_root_dir, serverKeyPathSize);
strncat(serverKeyPath, ssl_server_private_key_path, (serverKeyPathSize - strlen(serverKeyPath) - 1));
strncat(serverKeyPath, "/", (serverKeyPathSize - strlen(serverKeyPath) - 1));
strncat(serverKeyPath, ssl_server_private_key_filename, (serverKeyPathSize - strlen(serverKeyPath) - 1));
@@ -366,10 +360,10 @@ SslConfigParams::initialize()
}
if (ssl_server_private_key_path != NULL) {
- const size_t serverKeyPathOnlySize = system_base_install_len + strlen(ssl_server_private_key_path) + 1;
+ const size_t serverKeyPathOnlySize = system_root_dir_len + strlen(ssl_server_private_key_path) + 1;
serverKeyPathOnly = (char *) xmalloc(serverKeyPathOnlySize);
- ink_strncpy(serverKeyPathOnly, system_base_install, serverKeyPathOnlySize);
+ ink_strncpy(serverKeyPathOnly, system_root_dir, serverKeyPathOnlySize);
strncat(serverKeyPathOnly, ssl_server_private_key_path, (serverKeyPathOnlySize - strlen(serverKeyPathOnly) - 1));
strncat(serverKeyPathOnly, "/", (serverKeyPathOnlySize - strlen(serverKeyPathOnly) - 1));
xfree(ssl_server_private_key_path);
@@ -386,10 +380,10 @@ SslConfigParams::initialize()
IOCORE_ReadConfigStringAlloc(CACertRelativePath, "proxy.config.ssl.CA.cert.pathname");
if (CACertRelativePath != NULL) {
- const size_t CACertPathSize = system_base_install_len + strlen(CACertRelativePath) + 1;
+ const size_t CACertPathSize = system_root_dir_len + strlen(CACertRelativePath) + 1;
CACertPath = (char *) xmalloc(CACertPathSize);
- ink_strncpy(CACertPath, system_base_install, CACertPathSize);
+ ink_strncpy(CACertPath, system_root_dir, CACertPathSize);
strncat(CACertPath, CACertRelativePath, (CACertPathSize - strlen(CACertPath) - 1));
#ifdef _WIN32
i = 0;
@@ -412,10 +406,10 @@ SslConfigParams::initialize()
if (ssl_client_cert_filename != NULL) {
const size_t clientCertPathSize =
- system_base_install_len + strlen(ssl_client_cert_path) + strlen(ssl_client_cert_filename) + 1;
+ system_root_dir_len + strlen(ssl_client_cert_path) + strlen(ssl_client_cert_filename) + 1;
clientCertPath = (char *) xmalloc(clientCertPathSize);
- ink_strncpy(clientCertPath, system_base_install, clientCertPathSize);
+ ink_strncpy(clientCertPath, system_root_dir, clientCertPathSize);
strncat(clientCertPath, ssl_client_cert_path, (clientCertPathSize - strlen(clientCertPath) - 1));
strncat(clientCertPath, "/", (clientCertPathSize - strlen(clientCertPath) - 1));
strncat(clientCertPath, ssl_client_cert_filename, (clientCertPathSize - strlen(clientCertPath) - 1));
@@ -443,10 +437,10 @@ SslConfigParams::initialize()
if (ssl_client_private_key_filename != NULL) {
const size_t clientKeyPathSize =
- system_base_install_len + strlen(ssl_client_private_key_path) + strlen(ssl_client_private_key_filename) + 1;
+ system_root_dir_len + strlen(ssl_client_private_key_path) + strlen(ssl_client_private_key_filename) + 1;
clientKeyPath = (char *) xmalloc(clientKeyPathSize);
- ink_strncpy(clientKeyPath, system_base_install, clientKeyPathSize);
+ ink_strncpy(clientKeyPath, system_root_dir, clientKeyPathSize);
strncat(clientKeyPath, ssl_client_private_key_path, (clientKeyPathSize - strlen(clientKeyPath) - 1));
strncat(clientKeyPath, "/", (clientKeyPathSize - strlen(clientKeyPath) - 1));
strncat(clientKeyPath, ssl_client_private_key_filename, (clientKeyPathSize - strlen(clientKeyPath) - 1));
@@ -479,8 +473,8 @@ SslConfigParams::initialize()
// Notice that we don't put the filename at the
// end of this path. Its a quirk of the SSL lib interface.
if (clientCACertRelativePath != NULL) {
- clientCACertPath = (char *) xmalloc(system_base_install_len + strlen(clientCACertRelativePath) + 1);
- strcpy(clientCACertPath, system_base_install);
+ clientCACertPath = (char *) xmalloc(system_root_dir_len + strlen(clientCACertRelativePath) + 1);
+ strcpy(clientCACertPath, system_root_dir);
strcat(clientCACertPath, clientCACertRelativePath);
#ifdef _WIN32
i = 0;
@@ -537,7 +531,7 @@ register_ssl_net_configs(void)
IOCORE_RegisterConfigString(RECT_CONFIG,
"proxy.config.ssl.server.cert.path",
- "/conf/yts", RECU_DYNAMIC, RECC_STR, "^[^[:space:]]+$");
+ "etc/trafficserver", RECU_DYNAMIC, RECC_STR, "^[^[:space:]]+$");
IOCORE_RegisterConfigString(RECT_CONFIG,
"proxy.config.ssl.server.cert_chain.filename", NULL, RECU_DYNAMIC, RECC_STR, NULL);
@@ -565,7 +559,7 @@ register_ssl_net_configs(void)
"proxy.config.ssl.client.cert.filename", NULL, RECU_DYNAMIC, RECC_STR, "^[^[:space:]]*$");
IOCORE_RegisterConfigString(RECT_CONFIG,
- "proxy.config.ssl.client.cert.path", "/conf/yts", RECU_DYNAMIC, RECC_NULL, NULL);
+ "proxy.config.ssl.client.cert.path", "etc/trafficserver", RECU_DYNAMIC, RECC_NULL, NULL);
IOCORE_RegisterConfigString(RECT_CONFIG,
"proxy.config.ssl.client.private_key.filename",
@@ -143,7 +143,7 @@ SafeShell::Run()
}
-#define SAFESHELL_CONFIG_FILE "/export/home/inktomi/rubicon/conf/yts/.sfshrc"
+#define SAFESHELL_CONFIG_FILE "etc/trafficserver/.sfshrc"
// The main driver for the SafeShell program. It reads in a config dil
int
View
@@ -50,8 +50,8 @@
#define DEFAULT_NUMBER_OF_THREADS sysconf(_SC_NPROCESSORS_ONLN) // number of Net threads
#endif
#define DEFAULT_REMOTE_MANAGEMENT_FLAG 0
-#define DEFAULT_SYSTEM_CONFIG_DIRECTORY "conf/yts"
-#define DEFAULT_MANAGEMENT_DIRECTORY "conf/yts"
+#define DEFAULT_SYSTEM_CONFIG_DIRECTORY "etc/trafficserver"
+#define DEFAULT_MANAGEMENT_DIRECTORY "etc/trafficserver"
char error_tags[1024] = "";
View
@@ -177,7 +177,7 @@ REGRESSION_TEST(SDK_API_INKPluginDirGet) (RegressionTest * test, int atype, int
return;
}
- if (strstr(plugin_dir, "conf/yts/plugin") == NULL) {
+ if (strstr(plugin_dir, "etc/trafficserver/plugin") == NULL) {
SDK_RPRINT(test, "INKPluginDirGet", "TestCase2", TC_FAIL, "plugin dir is incorrect");
*pstatus = REGRESSION_TEST_FAILED;
return;
@@ -893,8 +893,8 @@ REGRESSION_TEST(SDK_API_INKfopen) (RegressionTest * test, int atype, int *pstatu
*pstatus = REGRESSION_TEST_FAILED;
return;
}
- // Add "conf/yts" to point to config directory
- snprintf(input_file_full_path, sizeof(input_file_full_path), "%s%s%s%s", install_dir, DIR_SEP, "conf/yts", DIR_SEP);
+ // Add "etc/trafficserver" to point to config directory
+ snprintf(input_file_full_path, sizeof(input_file_full_path), "%s%s%s%s", install_dir, DIR_SEP, "etc/trafficserver", DIR_SEP);
strncat(input_file_full_path, INPUT_TEXT_FILE, sizeof(INPUT_TEXT_FILE));
View
@@ -515,7 +515,6 @@ initialize_process_manager()
pmgmt->reconfigure();
- //TS_ReadConfigString(system_config_directory, "proxy.config.config_dir", PATH_NAME_MAX);
init_dirs();// setup directories
//
View
@@ -48,9 +48,9 @@
// TODO: consolidate location of these defaults
#define DEFAULT_ROOT_DIRECTORY PREFIX
-#define DEFAULT_LOCAL_STATE_DIRECTORY "./var/trafficserver"
-#define DEFAULT_SYSTEM_CONFIG_DIRECTORY "./etc/trafficserver"
-#define DEFAULT_LOG_DIRECTORY "./var/log/trafficserver"
+#define DEFAULT_LOCAL_STATE_DIRECTORY "var/trafficserver"
+#define DEFAULT_SYSTEM_CONFIG_DIRECTORY "etc/trafficserver"
+#define DEFAULT_LOG_DIRECTORY "var/log/trafficserver"
#define DEFAULT_TS_DIRECTORY_FILE PREFIX "/etc/traffic_server"
//
View
@@ -575,7 +575,7 @@ RafCont::process_query_cmd(char **argv, int argc)
{
const char stats[] = "/stats/";
- const char config[] = "/conf/yts/";
+ const char config[] = "/etc/trafficserver/";
int qstring_index = 2;
@@ -594,7 +594,7 @@ RafCont::process_query_cmd(char **argv, int argc)
if (strcmp(argv[qstring_index], "/*") == 0) {
output_resp_hdr(argv[0], 0);
- output_raf_msg(" /stats {} /conf/yts {}");
+ output_raf_msg(" /stats {} /etc/trafficserver {}");
} else if (strcmp(argv[qstring_index], "deadhosts") == 0) {
process_query_deadhosts(argv[0]);
// return 0;
@@ -7,5 +7,5 @@
# On WIN NT/2000
# test-plugin.dll arg1 arg2 arg3
#inktomi/iwx/iwx.so
-#inktomi/abuse/abuse.so conf/yts/abuse.config
-#inktomi/icx/icx.so conf/yts/icx.config
+#inktomi/abuse/abuse.so etc/trafficserver/abuse.config
+#inktomi/icx/icx.so etc/trafficserver/icx.config
@@ -27,7 +27,7 @@ CONFIG proxy.config.manager_binary STRING traffic_manager
CONFIG proxy.config.cli_binary STRING traffic_line
CONFIG proxy.config.watch_script STRING traffic_cop
CONFIG proxy.config.env_prep STRING example_prep.sh
-CONFIG proxy.config.config_dir STRING @prefix@/etc/@PACKAGE@
+CONFIG proxy.config.config_dir STRING etc/@PACKAGE@
CONFIG proxy.config.temp_dir STRING /tmp
CONFIG proxy.config.alarm_email STRING @pkgsysuser@
CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
@@ -340,7 +340,7 @@ CONFIG proxy.config.http.ftp.binary_transfer_only INT 0
# 2 - enable language-targeted user response pages
CONFIG proxy.config.body_factory.enable_customizations INT 0
CONFIG proxy.config.body_factory.enable_logging INT 0
-CONFIG proxy.config.body_factory.template_sets_dir STRING @prefix@/etc/@PACKAGE@/body_factory
+CONFIG proxy.config.body_factory.template_sets_dir STRING etc/@PACKAGE@/body_factory
# 0 - never suppress generated responses
# 1 - always suppress generated responses
# 2 - suppress responses for intercepted traffic
@@ -501,7 +501,7 @@ CONFIG proxy.config.log2.max_space_mb_for_logs INT 25000
CONFIG proxy.config.log2.max_space_mb_for_orphan_logs INT 25
CONFIG proxy.config.log2.max_space_mb_headroom INT 3000
CONFIG proxy.config.log2.hostname STRING localhost
-CONFIG proxy.config.log2.logfile_dir STRING @prefix@/var/log/@PACKAGE@
+CONFIG proxy.config.log2.logfile_dir STRING var/log/@PACKAGE@
CONFIG proxy.config.log2.logfile_perm STRING rw-r--r--
CONFIG proxy.config.log2.custom_logs_enabled INT 0
# 0: old log format, 1: new xml log format (default)
@@ -665,7 +665,7 @@ CONFIG proxy.config.ssl.server.cert.filename STRING server.pem
CONFIG proxy.config.ssl.server.cert_chain.filename STRING NULL
# This is the path that will be used for both single and
# multi cert systems.
-CONFIG proxy.config.ssl.server.cert.path STRING @prefix@/etc/@PACKAGE@
+CONFIG proxy.config.ssl.server.cert.path STRING etc/@PACKAGE@
# Fill in private key file and path only if the server's
# private key is not contained in the server certificate file.
# For multiple cert systems, if any private key is not contained
@@ -682,7 +682,7 @@ CONFIG proxy.config.ssl.CA.cert.path STRING NULL
################################
CONFIG proxy.config.ssl.client.verify.server INT 0
CONFIG proxy.config.ssl.client.cert.filename STRING NULL
-CONFIG proxy.config.ssl.client.cert.path STRING @prefix@/etc/@PACKAGE@
+CONFIG proxy.config.ssl.client.cert.path STRING etc/@PACKAGE@
# Fill in private key file and path only if the client's
# private key is not contained in the client certificate file.
CONFIG proxy.config.ssl.client.private_key.filename STRING NULL
@@ -730,7 +730,7 @@ CONFIG proxy.config.snmp.snmp_encap_enabled INT 0
#
##############################################################################
# Directory in which to find plugins
-CONFIG proxy.config.plugin.plugin_dir STRING @prefix@/libexec/@PACKAGE@
+CONFIG proxy.config.plugin.plugin_dir STRING libexec/@PACKAGE@
##############################################################################
#
# Remote Access Framework
@@ -15,9 +15,11 @@
# the cache-file to live and 'size' is size in bytes
#
# Example: 128MB cache file(/usr/local/trafficserver/cache/cache.db)
-#
#/usr/local/trafficserver/cache 134217728
-#. 536870912
+#
+# Example: 512MB cache file(/usr/local/var/trafficserver/cache.db)
+# assuming prefix of '/usr/local'
+#./var/trafficserver 536870912
#
#
#############################################################
View
@@ -475,7 +475,7 @@ LogFile::roll(long interval_start, long interval_end)
ink_assert(found);
#endif
*/
- sprintf(file_name, "%s%s%s%s%s", "../conf/yts", DIR_SEP, "internal", DIR_SEP, "ftp_logging.config");
+ sprintf(file_name, "%s%s%s%s%s", "../etc/trafficserver", DIR_SEP, "internal", DIR_SEP, "ftp_logging.config");
if (access(file_name, F_OK) != 0)
return 1;
Oops, something went wrong.

0 comments on commit c810e89

Please sign in to comment.