trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r1085478 - in /trafficserver/traffic/trunk: ./ proxy/config/
Date Fri, 25 Mar 2011 17:25:31 GMT
Author: zwoop
Date: Fri Mar 25 17:25:29 2011
New Revision: 1085478

URL: http://svn.apache.org/viewvc?rev=1085478&view=rev
Log:
TS-624 make install should not overwrite etc/trafficserver/*

Author: Eric Connell
Review: leif

Added:
    trafficserver/traffic/trunk/proxy/config/admin_access.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/admin_access.config
    trafficserver/traffic/trunk/proxy/config/ae_ua.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/ae_ua.config
    trafficserver/traffic/trunk/proxy/config/cache.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/cache.config
    trafficserver/traffic/trunk/proxy/config/cluster.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/cluster.config
    trafficserver/traffic/trunk/proxy/config/congestion.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/congestion.config
    trafficserver/traffic/trunk/proxy/config/hosting.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/hosting.config
    trafficserver/traffic/trunk/proxy/config/icp.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/icp.config
    trafficserver/traffic/trunk/proxy/config/ip_allow.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/ip_allow.config
    trafficserver/traffic/trunk/proxy/config/log_hosts.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/log_hosts.config
    trafficserver/traffic/trunk/proxy/config/logs_xml.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/logs_xml.config
    trafficserver/traffic/trunk/proxy/config/mgmt_allow.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/mgmt_allow.config
    trafficserver/traffic/trunk/proxy/config/mgr.cnf.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/mgr.cnf
    trafficserver/traffic/trunk/proxy/config/parent.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/parent.config
    trafficserver/traffic/trunk/proxy/config/partition.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/partition.config
    trafficserver/traffic/trunk/proxy/config/plugin.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/plugin.config
    trafficserver/traffic/trunk/proxy/config/plugin.db.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/plugin.db
    trafficserver/traffic/trunk/proxy/config/prefetch.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/prefetch.config
    trafficserver/traffic/trunk/proxy/config/records.config.default.in
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/records.config.in
    trafficserver/traffic/trunk/proxy/config/remap.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/remap.config
    trafficserver/traffic/trunk/proxy/config/socks.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/socks.config
    trafficserver/traffic/trunk/proxy/config/splitdns.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/splitdns.config
    trafficserver/traffic/trunk/proxy/config/ssl_multicert.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/ssl_multicert.config
    trafficserver/traffic/trunk/proxy/config/stats.config.xml.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/stats.config.xml
    trafficserver/traffic/trunk/proxy/config/storage.config.default.in
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/storage.config.in
    trafficserver/traffic/trunk/proxy/config/update.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/update.config
    trafficserver/traffic/trunk/proxy/config/vaddrs.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/vaddrs.config
    trafficserver/traffic/trunk/proxy/config/winnt_intr.config.default
      - copied unchanged from r1085473, trafficserver/traffic/trunk/proxy/config/winnt_intr.config
Removed:
    trafficserver/traffic/trunk/proxy/config/admin_access.config
    trafficserver/traffic/trunk/proxy/config/ae_ua.config
    trafficserver/traffic/trunk/proxy/config/cache.config
    trafficserver/traffic/trunk/proxy/config/cluster.config
    trafficserver/traffic/trunk/proxy/config/congestion.config
    trafficserver/traffic/trunk/proxy/config/hosting.config
    trafficserver/traffic/trunk/proxy/config/icp.config
    trafficserver/traffic/trunk/proxy/config/ip_allow.config
    trafficserver/traffic/trunk/proxy/config/log_hosts.config
    trafficserver/traffic/trunk/proxy/config/logs_xml.config
    trafficserver/traffic/trunk/proxy/config/mgmt_allow.config
    trafficserver/traffic/trunk/proxy/config/mgr.cnf
    trafficserver/traffic/trunk/proxy/config/parent.config
    trafficserver/traffic/trunk/proxy/config/partition.config
    trafficserver/traffic/trunk/proxy/config/plugin.config
    trafficserver/traffic/trunk/proxy/config/plugin.db
    trafficserver/traffic/trunk/proxy/config/prefetch.config
    trafficserver/traffic/trunk/proxy/config/records.config.in
    trafficserver/traffic/trunk/proxy/config/remap.config
    trafficserver/traffic/trunk/proxy/config/socks.config
    trafficserver/traffic/trunk/proxy/config/splitdns.config
    trafficserver/traffic/trunk/proxy/config/ssl_multicert.config
    trafficserver/traffic/trunk/proxy/config/stats.config.xml
    trafficserver/traffic/trunk/proxy/config/storage.config.in
    trafficserver/traffic/trunk/proxy/config/update.config
    trafficserver/traffic/trunk/proxy/config/vaddrs.config
    trafficserver/traffic/trunk/proxy/config/winnt_intr.config
Modified:
    trafficserver/traffic/trunk/configure.ac
    trafficserver/traffic/trunk/proxy/config/Makefile.am

Modified: trafficserver/traffic/trunk/configure.ac
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/configure.ac?rev=1085478&r1=1085477&r2=1085478&view=diff
==============================================================================
--- trafficserver/traffic/trunk/configure.ac (original)
+++ trafficserver/traffic/trunk/configure.ac Fri Mar 25 17:25:29 2011
@@ -1188,7 +1188,7 @@ AC_CONFIG_FILES([lib/tsconfig/Makefile])
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([proxy/config/body_factory/default/Makefile])
 AC_CONFIG_FILES([proxy/config/body_factory/Makefile])
-AC_CONFIG_FILES([proxy/config/records.config proxy/config/storage.config])
+AC_CONFIG_FILES([proxy/config/records.config.default proxy/config/storage.config.default])
 AC_CONFIG_FILES([proxy/config/Makefile])
 AC_CONFIG_FILES([proxy/congest/Makefile])
 AC_CONFIG_FILES([proxy/hdrs/Makefile])

Modified: trafficserver/traffic/trunk/proxy/config/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/config/Makefile.am?rev=1085478&r1=1085477&r2=1085478&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/config/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/config/Makefile.am Fri Mar 25 17:25:29 2011
@@ -18,40 +18,47 @@
 
 SUBDIRS = body_factory
 EXTRA_DIST = \
-  records.config.in \
-  storage.config.in
+  records.config.default.in \
+  storage.config.default.in
 
 sysconfdir = $(pkgsysconfdir)
 nodist_sysconf_DATA = \
-  records.config \
-  storage.config
+  records.config.default \
+  storage.config.default
 
 webui_conf = \
-  admin_access.config
+  admin_access.config.default
 
 dist_sysconf_DATA =	\
-  ae_ua.config \
-  cache.config \
-  cluster.config \
-  congestion.config \
-  hosting.config \
-  icp.config \
-  ip_allow.config \
-  log_hosts.config \
-  logs_xml.config \
-  mgmt_allow.config \
-  mgr.cnf \
-  parent.config \
-  partition.config \
-  plugin.config \
-  plugin.db \
-  remap.config \
-  socks.config \
-  splitdns.config \
-  ssl_multicert.config \
-  stats.config.xml \
-  update.config \
-  vaddrs.config
+  ae_ua.config.default \
+  cache.config.default \
+  cluster.config.default \
+  congestion.config.default \
+  hosting.config.default \
+  icp.config.default \
+  ip_allow.config.default \
+  log_hosts.config.default \
+  logs_xml.config.default \
+  mgmt_allow.config.default \
+  mgr.cnf.default \
+  parent.config.default \
+  partition.config.default \
+  plugin.config.default \
+  plugin.db.default \
+  remap.config.default \
+  socks.config.default \
+  splitdns.config.default \
+  ssl_multicert.config.default \
+  stats.config.xml.default \
+  update.config.default \
+  vaddrs.config.default
+
+install-exec-hook:
+	for dfltcfgfile in $(dist_sysconf_DATA) $(nodist_sysconf_DATA) ; \
+	do \
+		cfgfile=`echo $$dfltcfgfile | sed 's/\.default$$//'` ; \
+		test -f $(sysconfdir)/$$cfgfile || mv $(sysconfdir)/$$dfltcfgfile $(sysconfdir)/$$cfgfile
; \
+	done
 
 if BUILD_WEBUI
   dist_sysconf_DATA += $(webui_conf)



Mime
View raw message