From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 22 Aug 2013 10:53:09 +0000 (+0200)
Subject: Package metaproxy introduces ports.d/routes.d include
X-Git-Tag: v1.3.61~3
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=8f71ff0deb3b40baf87f8d96c0bef3768c15e14c;p=metaproxy-moved-to-github.git

Package metaproxy introduces ports.d/routes.d include

This allows custom ports and routes to be added by 3rd party.
---

diff --git a/debian/metaproxy.dirs b/debian/metaproxy.dirs
index e92e2fd..21bdacc 100644
--- a/debian/metaproxy.dirs
+++ b/debian/metaproxy.dirs
@@ -1,2 +1,4 @@
 etc/metaproxy/filters-enabled
 etc/metaproxy/filters-available
+etc/metaproxy/ports.d
+etc/metaproxy/routes.d
diff --git a/debian/metaproxy.xml b/debian/metaproxy.xml
index f766210..4d21276 100644
--- a/debian/metaproxy.xml
+++ b/debian/metaproxy.xml
@@ -6,6 +6,7 @@
     <filter id="frontend" type="frontend_net">
       <threads>50</threads>
       <port>@:9000</port>
+      <include src="ports.d/*.xml"/>
       <message>FN</message>
     </filter>
   </filters>
@@ -15,6 +16,7 @@
       <include src="filters-enabled/*.xml"/>
       <filter type="bounce"/>
     </route>
+    <include src="routes.d/*.xml"/>
   </routes>
 </metaproxy>
 
diff --git a/metaproxy.spec b/metaproxy.spec
index 77876e2..563b7da 100644
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -63,6 +63,8 @@ rm -f ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy/*
 mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy4/modules
 mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/filters-enabled
 mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/filters-available
+mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/ports.d
+mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/routes.d
 mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
 mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
 mkdir -p ${RPM_BUILD_ROOT}/etc/sysconfig
diff --git a/rpm/metaproxy.xml b/rpm/metaproxy.xml
index 8982a4a..e3ca70a 100644
--- a/rpm/metaproxy.xml
+++ b/rpm/metaproxy.xml
@@ -6,6 +6,7 @@
     <filter id="frontend" type="frontend_net">
       <threads>50</threads>
       <port>@:9000</port>
+      <include src="ports.d/*.xml"/>
       <!-- Uncomment the message below to get queue/thread usage logging -->
       <message>FN</message>
     </filter>
@@ -16,6 +17,7 @@
       <include src="filters-enabled/*.xml"/>
       <filter type="bounce"/>
     </route>
+    <include src="routes.d/*.xml"/>
   </routes>
 </metaproxy>