This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit bfaada3eb5929e671e853d61757349fcbedb3fbc Author: Randall Meyer <[email protected]> AuthorDate: Tue Jun 19 12:30:44 2018 -0700 Relocates proxy/config to configs (cherry picked from commit 91df079cf80bd8f901884a44e5948fd2fb409b1e) --- .gitignore | 5 +++-- Makefile.am | 2 +- {proxy/config => configs}/Makefile.am | 0 {proxy/config => configs}/body_factory/Makefile.am | 0 .../config => configs}/body_factory/default/.body_factory_info | 0 {proxy/config => configs}/body_factory/default/Makefile.am | 0 {proxy/config => configs}/body_factory/default/README | 0 {proxy/config => configs}/body_factory/default/access#denied | 0 .../body_factory/default/access#proxy_auth_required | 0 .../body_factory/default/access#redirect_url | 0 .../body_factory/default/access#ssl_forbidden | 0 .../config => configs}/body_factory/default/cache#not_in_cache | 0 .../config => configs}/body_factory/default/cache#read_error | 0 .../config => configs}/body_factory/default/connect#dns_failed | 0 .../body_factory/default/connect#failed_connect | 0 {proxy/config => configs}/body_factory/default/connect#hangup | 0 {proxy/config => configs}/body_factory/default/default | 0 .../body_factory/default/interception#no_host | 0 .../body_factory/default/redirect#moved_permanently | 0 .../body_factory/default/redirect#moved_temporarily | 0 .../body_factory/default/request#cycle_detected | 0 .../body_factory/default/request#invalid_content_length | 0 .../body_factory/default/request#no_content_length | 0 {proxy/config => configs}/body_factory/default/request#no_host | 0 .../body_factory/default/request#scheme_unsupported | 0 .../body_factory/default/request#syntax_error | 0 .../body_factory/default/response#bad_response | 0 .../body_factory/default/response#bad_version | 0 .../config => configs}/body_factory/default/timeout#activity | 0 .../config => configs}/body_factory/default/timeout#inactivity | 0 .../body_factory/default/transcoding#unsupported | 0 .../body_factory/default/urlrouting#no_mapping | 0 {proxy/config => configs}/cache.config.default | 0 {proxy/config => configs}/hosting.config.default | 0 {proxy/config => configs}/ip_allow.config.default | 0 {proxy/config => configs}/logging.config.default | 0 {proxy/config => configs}/parent.config.default | 0 {proxy/config => configs}/plugin.config.default | 0 {proxy/config => configs}/records.config.default.in | 0 {proxy/config => configs}/remap.config.default | 0 {proxy/config => configs}/socks.config.default | 0 {proxy/config => configs}/splitdns.config.default | 0 {proxy/config => configs}/ssl_multicert.config.default | 0 {proxy/config => configs}/ssl_server_name.config.default | 0 {proxy/config => configs}/storage.config.default.in | 0 {proxy/config => configs}/throttle_error.html.example | 0 {proxy/config => configs}/volume.config.default | 0 configure.ac | 10 +++++----- proxy/Makefile.am | 2 +- 49 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index eb51aad..c487305 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,9 @@ config.status config.nice config.h +configs/records.config.default +configs/storage.config.default + doc/_build/html/api/ doc/_build/locale/ doc/docbuild/ @@ -99,8 +102,6 @@ iocore/eventsystem/test_Event iocore/eventsystem/test_MIOBufferWriter iocore/hostdb/test_RefCountCache -proxy/config/records.config.default -proxy/config/storage.config.default proxy/hdrs/test_mime proxy/http/test_ForwardedConfig proxy/http2/test_Huffmancode diff --git a/Makefile.am b/Makefile.am index fb819d8..9ba8548 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ export CCACHE_BASEDIR # proxy/api/ts has to be built first, since so much of libraries and "core # depends on the generates ts/ts.h include file. -SUBDIRS = proxy/api/ts lib iocore proxy mgmt src plugins tools example rc +SUBDIRS = proxy/api/ts lib iocore proxy mgmt src plugins tools example rc configs if BUILD_DOCS SUBDIRS += doc diff --git a/proxy/config/Makefile.am b/configs/Makefile.am similarity index 100% rename from proxy/config/Makefile.am rename to configs/Makefile.am diff --git a/proxy/config/body_factory/Makefile.am b/configs/body_factory/Makefile.am similarity index 100% rename from proxy/config/body_factory/Makefile.am rename to configs/body_factory/Makefile.am diff --git a/proxy/config/body_factory/default/.body_factory_info b/configs/body_factory/default/.body_factory_info similarity index 100% rename from proxy/config/body_factory/default/.body_factory_info rename to configs/body_factory/default/.body_factory_info diff --git a/proxy/config/body_factory/default/Makefile.am b/configs/body_factory/default/Makefile.am similarity index 100% rename from proxy/config/body_factory/default/Makefile.am rename to configs/body_factory/default/Makefile.am diff --git a/proxy/config/body_factory/default/README b/configs/body_factory/default/README similarity index 100% rename from proxy/config/body_factory/default/README rename to configs/body_factory/default/README diff --git a/proxy/config/body_factory/default/access#denied b/configs/body_factory/default/access#denied similarity index 100% rename from proxy/config/body_factory/default/access#denied rename to configs/body_factory/default/access#denied diff --git a/proxy/config/body_factory/default/access#proxy_auth_required b/configs/body_factory/default/access#proxy_auth_required similarity index 100% rename from proxy/config/body_factory/default/access#proxy_auth_required rename to configs/body_factory/default/access#proxy_auth_required diff --git a/proxy/config/body_factory/default/access#redirect_url b/configs/body_factory/default/access#redirect_url similarity index 100% rename from proxy/config/body_factory/default/access#redirect_url rename to configs/body_factory/default/access#redirect_url diff --git a/proxy/config/body_factory/default/access#ssl_forbidden b/configs/body_factory/default/access#ssl_forbidden similarity index 100% rename from proxy/config/body_factory/default/access#ssl_forbidden rename to configs/body_factory/default/access#ssl_forbidden diff --git a/proxy/config/body_factory/default/cache#not_in_cache b/configs/body_factory/default/cache#not_in_cache similarity index 100% rename from proxy/config/body_factory/default/cache#not_in_cache rename to configs/body_factory/default/cache#not_in_cache diff --git a/proxy/config/body_factory/default/cache#read_error b/configs/body_factory/default/cache#read_error similarity index 100% rename from proxy/config/body_factory/default/cache#read_error rename to configs/body_factory/default/cache#read_error diff --git a/proxy/config/body_factory/default/connect#dns_failed b/configs/body_factory/default/connect#dns_failed similarity index 100% rename from proxy/config/body_factory/default/connect#dns_failed rename to configs/body_factory/default/connect#dns_failed diff --git a/proxy/config/body_factory/default/connect#failed_connect b/configs/body_factory/default/connect#failed_connect similarity index 100% rename from proxy/config/body_factory/default/connect#failed_connect rename to configs/body_factory/default/connect#failed_connect diff --git a/proxy/config/body_factory/default/connect#hangup b/configs/body_factory/default/connect#hangup similarity index 100% rename from proxy/config/body_factory/default/connect#hangup rename to configs/body_factory/default/connect#hangup diff --git a/proxy/config/body_factory/default/default b/configs/body_factory/default/default similarity index 100% rename from proxy/config/body_factory/default/default rename to configs/body_factory/default/default diff --git a/proxy/config/body_factory/default/interception#no_host b/configs/body_factory/default/interception#no_host similarity index 100% rename from proxy/config/body_factory/default/interception#no_host rename to configs/body_factory/default/interception#no_host diff --git a/proxy/config/body_factory/default/redirect#moved_permanently b/configs/body_factory/default/redirect#moved_permanently similarity index 100% rename from proxy/config/body_factory/default/redirect#moved_permanently rename to configs/body_factory/default/redirect#moved_permanently diff --git a/proxy/config/body_factory/default/redirect#moved_temporarily b/configs/body_factory/default/redirect#moved_temporarily similarity index 100% rename from proxy/config/body_factory/default/redirect#moved_temporarily rename to configs/body_factory/default/redirect#moved_temporarily diff --git a/proxy/config/body_factory/default/request#cycle_detected b/configs/body_factory/default/request#cycle_detected similarity index 100% rename from proxy/config/body_factory/default/request#cycle_detected rename to configs/body_factory/default/request#cycle_detected diff --git a/proxy/config/body_factory/default/request#invalid_content_length b/configs/body_factory/default/request#invalid_content_length similarity index 100% rename from proxy/config/body_factory/default/request#invalid_content_length rename to configs/body_factory/default/request#invalid_content_length diff --git a/proxy/config/body_factory/default/request#no_content_length b/configs/body_factory/default/request#no_content_length similarity index 100% rename from proxy/config/body_factory/default/request#no_content_length rename to configs/body_factory/default/request#no_content_length diff --git a/proxy/config/body_factory/default/request#no_host b/configs/body_factory/default/request#no_host similarity index 100% rename from proxy/config/body_factory/default/request#no_host rename to configs/body_factory/default/request#no_host diff --git a/proxy/config/body_factory/default/request#scheme_unsupported b/configs/body_factory/default/request#scheme_unsupported similarity index 100% rename from proxy/config/body_factory/default/request#scheme_unsupported rename to configs/body_factory/default/request#scheme_unsupported diff --git a/proxy/config/body_factory/default/request#syntax_error b/configs/body_factory/default/request#syntax_error similarity index 100% rename from proxy/config/body_factory/default/request#syntax_error rename to configs/body_factory/default/request#syntax_error diff --git a/proxy/config/body_factory/default/response#bad_response b/configs/body_factory/default/response#bad_response similarity index 100% rename from proxy/config/body_factory/default/response#bad_response rename to configs/body_factory/default/response#bad_response diff --git a/proxy/config/body_factory/default/response#bad_version b/configs/body_factory/default/response#bad_version similarity index 100% rename from proxy/config/body_factory/default/response#bad_version rename to configs/body_factory/default/response#bad_version diff --git a/proxy/config/body_factory/default/timeout#activity b/configs/body_factory/default/timeout#activity similarity index 100% rename from proxy/config/body_factory/default/timeout#activity rename to configs/body_factory/default/timeout#activity diff --git a/proxy/config/body_factory/default/timeout#inactivity b/configs/body_factory/default/timeout#inactivity similarity index 100% rename from proxy/config/body_factory/default/timeout#inactivity rename to configs/body_factory/default/timeout#inactivity diff --git a/proxy/config/body_factory/default/transcoding#unsupported b/configs/body_factory/default/transcoding#unsupported similarity index 100% rename from proxy/config/body_factory/default/transcoding#unsupported rename to configs/body_factory/default/transcoding#unsupported diff --git a/proxy/config/body_factory/default/urlrouting#no_mapping b/configs/body_factory/default/urlrouting#no_mapping similarity index 100% rename from proxy/config/body_factory/default/urlrouting#no_mapping rename to configs/body_factory/default/urlrouting#no_mapping diff --git a/proxy/config/cache.config.default b/configs/cache.config.default similarity index 100% rename from proxy/config/cache.config.default rename to configs/cache.config.default diff --git a/proxy/config/hosting.config.default b/configs/hosting.config.default similarity index 100% rename from proxy/config/hosting.config.default rename to configs/hosting.config.default diff --git a/proxy/config/ip_allow.config.default b/configs/ip_allow.config.default similarity index 100% rename from proxy/config/ip_allow.config.default rename to configs/ip_allow.config.default diff --git a/proxy/config/logging.config.default b/configs/logging.config.default similarity index 100% rename from proxy/config/logging.config.default rename to configs/logging.config.default diff --git a/proxy/config/parent.config.default b/configs/parent.config.default similarity index 100% rename from proxy/config/parent.config.default rename to configs/parent.config.default diff --git a/proxy/config/plugin.config.default b/configs/plugin.config.default similarity index 100% rename from proxy/config/plugin.config.default rename to configs/plugin.config.default diff --git a/proxy/config/records.config.default.in b/configs/records.config.default.in similarity index 100% rename from proxy/config/records.config.default.in rename to configs/records.config.default.in diff --git a/proxy/config/remap.config.default b/configs/remap.config.default similarity index 100% rename from proxy/config/remap.config.default rename to configs/remap.config.default diff --git a/proxy/config/socks.config.default b/configs/socks.config.default similarity index 100% rename from proxy/config/socks.config.default rename to configs/socks.config.default diff --git a/proxy/config/splitdns.config.default b/configs/splitdns.config.default similarity index 100% rename from proxy/config/splitdns.config.default rename to configs/splitdns.config.default diff --git a/proxy/config/ssl_multicert.config.default b/configs/ssl_multicert.config.default similarity index 100% rename from proxy/config/ssl_multicert.config.default rename to configs/ssl_multicert.config.default diff --git a/proxy/config/ssl_server_name.config.default b/configs/ssl_server_name.config.default similarity index 100% rename from proxy/config/ssl_server_name.config.default rename to configs/ssl_server_name.config.default diff --git a/proxy/config/storage.config.default.in b/configs/storage.config.default.in similarity index 100% rename from proxy/config/storage.config.default.in rename to configs/storage.config.default.in diff --git a/proxy/config/throttle_error.html.example b/configs/throttle_error.html.example similarity index 100% rename from proxy/config/throttle_error.html.example rename to configs/throttle_error.html.example diff --git a/proxy/config/volume.config.default b/configs/volume.config.default similarity index 100% rename from proxy/config/volume.config.default rename to configs/volume.config.default diff --git a/configure.ac b/configure.ac index 9e4545a..578e39b 100644 --- a/configure.ac +++ b/configure.ac @@ -2024,6 +2024,11 @@ AS_IF([test "x$RPATH" != "x"], [ AC_CONFIG_FILES([ Makefile src/Makefile + configs/Makefile + configs/body_factory/Makefile + configs/body_factory/default/Makefile + configs/records.config.default + configs/storage.config.default doc/Makefile doc/ext/local-config.py doc/uml/Makefile @@ -2054,11 +2059,6 @@ AC_CONFIG_FILES([ plugins/Makefile proxy/Makefile proxy/api/ts/Makefile - proxy/config/Makefile - proxy/config/body_factory/Makefile - proxy/config/body_factory/default/Makefile - proxy/config/records.config.default - proxy/config/storage.config.default proxy/hdrs/Makefile proxy/http/Makefile proxy/http/remap/Makefile diff --git a/proxy/Makefile.am b/proxy/Makefile.am index c6fe8ac..c996669 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -18,7 +18,7 @@ include $(top_srcdir)/build/tidy.mk -SUBDIRS = hdrs shared http http2 logging config +SUBDIRS = hdrs shared http http2 logging noinst_LIBRARIES = libproxy.a
