Merge pull request #827 from PiBa-NL/haproxy-devel21

17 files changed, 16 insertions, 16 deletions

diff --git a/config/haproxy-devel/haproxy.xml b/config/haproxy-devel/haproxy.xml
index e4fe3610..e057bfb2 100644
--- a/config/haproxy-devel/haproxy.xml
+++ b/config/haproxy-devel/haproxy.xml
@@ -76,82 +76,82 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.inc</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_listeners.php</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_listeners.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_listeners_edit.php</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_listeners_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_global.php</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_global.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_files.php</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_files.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_pools.php</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_pools.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_pool_edit.php</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_pool_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_stats.php</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_stats.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_templates.php</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/haproxy_templates.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_socketinfo.inc</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_socketinfo.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_xmlrpcsyncclient.inc</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_htmllist.inc</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_htmllist.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy_utils.inc</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/haproxy_utils.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/widgets/widgets/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.widget.php</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/widgets/widgets/haproxy.widget.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/shortcuts/</prefix>
 		<chmod>0755</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg_haproxy.inc</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/www/shortcuts/pkg_haproxy.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
-		<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg_haproxy_tabs.inc</item>
+		<item>https://packages.pfsense.org/packages/config/haproxy-devel/pkg/pkg_haproxy_tabs.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/pkg/haproxy.inc
index 15fbcd17..15fbcd17 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/pkg/haproxy.inc
diff --git a/config/haproxy-devel/haproxy_htmllist.inc b/config/haproxy-devel/pkg/haproxy_htmllist.inc
index f873028e..f873028e 100644
--- a/config/haproxy-devel/haproxy_htmllist.inc
+++ b/config/haproxy-devel/pkg/haproxy_htmllist.inc
diff --git a/config/haproxy-devel/haproxy_socketinfo.inc b/config/haproxy-devel/pkg/haproxy_socketinfo.inc
index cbfb131b..cbfb131b 100644
--- a/config/haproxy-devel/haproxy_socketinfo.inc
+++ b/config/haproxy-devel/pkg/haproxy_socketinfo.inc
diff --git a/config/haproxy-devel/haproxy_utils.inc b/config/haproxy-devel/pkg/haproxy_utils.inc
index 4b945c06..4b945c06 100644
--- a/config/haproxy-devel/haproxy_utils.inc
+++ b/config/haproxy-devel/pkg/haproxy_utils.inc
diff --git a/config/haproxy-devel/haproxy_xmlrpcsyncclient.inc b/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc
index 699dffd1..699dffd1 100644
--- a/config/haproxy-devel/haproxy_xmlrpcsyncclient.inc
+++ b/config/haproxy-devel/pkg/haproxy_xmlrpcsyncclient.inc
diff --git a/config/haproxy-devel/pkg_haproxy_tabs.inc b/config/haproxy-devel/pkg/pkg_haproxy_tabs.inc
index a74ee20a..a74ee20a 100644
--- a/config/haproxy-devel/pkg_haproxy_tabs.inc
+++ b/config/haproxy-devel/pkg/pkg_haproxy_tabs.inc
diff --git a/config/haproxy-devel/haproxy_files.php b/config/haproxy-devel/www/haproxy_files.php
index 4946a7be..4946a7be 100644
--- a/config/haproxy-devel/haproxy_files.php
+++ b/config/haproxy-devel/www/haproxy_files.php
diff --git a/config/haproxy-devel/haproxy_global.php b/config/haproxy-devel/www/haproxy_global.php
index 978d778d..978d778d 100755..100644
--- a/config/haproxy-devel/haproxy_global.php
+++ b/config/haproxy-devel/www/haproxy_global.php
diff --git a/config/haproxy-devel/haproxy_listeners.php b/config/haproxy-devel/www/haproxy_listeners.php
index db1f3ff2..db1f3ff2 100644
--- a/config/haproxy-devel/haproxy_listeners.php
+++ b/config/haproxy-devel/www/haproxy_listeners.php
diff --git a/config/haproxy-devel/haproxy_listeners_edit.php b/config/haproxy-devel/www/haproxy_listeners_edit.php
index d8841c33..d8841c33 100644
--- a/config/haproxy-devel/haproxy_listeners_edit.php
+++ b/config/haproxy-devel/www/haproxy_listeners_edit.php
diff --git a/config/haproxy-devel/haproxy_pool_edit.php b/config/haproxy-devel/www/haproxy_pool_edit.php
index 5e38b12d..5e38b12d 100644
--- a/config/haproxy-devel/haproxy_pool_edit.php
+++ b/config/haproxy-devel/www/haproxy_pool_edit.php
diff --git a/config/haproxy-devel/haproxy_pools.php b/config/haproxy-devel/www/haproxy_pools.php
index 92235933..92235933 100644
--- a/config/haproxy-devel/haproxy_pools.php
+++ b/config/haproxy-devel/www/haproxy_pools.php
diff --git a/config/haproxy-devel/haproxy_stats.php b/config/haproxy-devel/www/haproxy_stats.php
index 302793b6..302793b6 100644
--- a/config/haproxy-devel/haproxy_stats.php
+++ b/config/haproxy-devel/www/haproxy_stats.php
diff --git a/config/haproxy-devel/haproxy_templates.php b/config/haproxy-devel/www/haproxy_templates.php
index 478c83a3..478c83a3 100644
--- a/config/haproxy-devel/haproxy_templates.php
+++ b/config/haproxy-devel/www/haproxy_templates.php
diff --git a/config/haproxy-devel/pkg_haproxy.inc b/config/haproxy-devel/www/shortcuts/pkg_haproxy.inc
index 1e5c75c2..1e5c75c2 100755..100644
--- a/config/haproxy-devel/pkg_haproxy.inc
+++ b/config/haproxy-devel/www/shortcuts/pkg_haproxy.inc
diff --git a/config/haproxy-devel/haproxy.widget.php b/config/haproxy-devel/www/widgets/widgets/haproxy.widget.php
index 5d664e81..5d664e81 100644
--- a/config/haproxy-devel/haproxy.widget.php
+++ b/config/haproxy-devel/www/widgets/widgets/haproxy.widget.php