Repository: trafficserver Updated Branches: refs/heads/master c6af7a644 -> 7c3c17ec7
TS-2274 Restore enough configurations that makes traffic_cop start again Thanks to Bryan for testing / finding this. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7c3c17ec Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7c3c17ec Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7c3c17ec Branch: refs/heads/master Commit: 7c3c17ec748a8f11012af1a471877ec885c8ba96 Parents: c6af7a6 Author: Leif Hedstrom <[email protected]> Authored: Wed May 21 17:41:17 2014 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Wed May 21 17:41:44 2014 -0600 ---------------------------------------------------------------------- proxy/config/records.config.default.in | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c3c17ec/proxy/config/records.config.default.in ---------------------------------------------------------------------- diff --git a/proxy/config/records.config.default.in b/proxy/config/records.config.default.in index bc35db0..9a1e81e 100644 --- a/proxy/config/records.config.default.in +++ b/proxy/config/records.config.default.in @@ -4,9 +4,6 @@ # http://docs.trafficserver.apache.org/en/latest/reference/configuration/records.config.en.html ############################################################################## -CONFIG proxy.config.proxy_name STRING @build_machine@ -CONFIG proxy.config.admin.user_id STRING @pkgsysuser@ - ############################################################################## # Thread configurations. Docs: # http://docs.trafficserver.apache.org/records.config#proxy-config-exec-thread-autoconfig @@ -180,3 +177,22 @@ CONFIG proxy.config.diags.debug.tags STRING http.*|dns.* # ToDo: Undocumented CONFIG proxy.config.dump_mem_info_frequency INT 0 CONFIG proxy.config.http.slow.log.threshold INT 0 + +############################################################################## +# These are necessary (for now) to keep traffic_manager/_cop happy. +############################################################################## +CONFIG proxy.config.proxy_name STRING @build_machine@ +CONFIG proxy.config.admin.user_id STRING @pkgsysuser@ +CONFIG proxy.config.log.logfile_dir STRING @rel_logdir@ +CONFIG proxy.config.output.logfile STRING traffic.out + +############################################################################## +# Cluster Subsystem. Docs: +# http://docs.trafficserver.apache.org/records.config#cluster +############################################################################## +LOCAL proxy.local.cluster.type INT 3 +CONFIG proxy.config.cluster.ethernet_interface STRING @default_loopback_iface@ +CONFIG proxy.config.cluster.cluster_port INT 8086 +CONFIG proxy.config.cluster.rsport INT 8088 +CONFIG proxy.config.cluster.mcport INT 8089 +CONFIG proxy.config.cluster.mc_group_addr STRING 224.0.1.37
