Merge branch 'master' of https://github.com/pfsense/pfsense-packages into hap_de-install_logging

Conflicts:
	config/haproxy-devel/haproxy.inc

5 files changed, 14 insertions, 14 deletions

diff --git a/config/varnish64/varnish.widget.php b/config/varnish64/varnish.widget.php
index 35980db5..35723e95 100755
--- a/config/varnish64/varnish.widget.php
+++ b/config/varnish64/varnish.widget.php
@@ -2,7 +2,7 @@
 /*
         Copyright 2011 Thomas Schaefer - Tomschaefer.org
         Copyright 2011 Marcello Coutinho
-        Part of pfSense widgets (www.pfsense.com)
+        Part of pfSense widgets (www.pfsense.org)
 
         Redistribution and use in source and binary forms, with or without
         modification, are permitted provided that the following conditions are met:
diff --git a/config/varnish64/varnish_backends.xml b/config/varnish64/varnish_backends.xml
index d6aaa261..fa549063 100644
--- a/config/varnish64/varnish_backends.xml
+++ b/config/varnish64/varnish_backends.xml
@@ -48,42 +48,42 @@
    	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/varnish64/varnish_lb_directors.xml</item>
+	    <item>https://packages.pfsense.org/packages/config/varnish64/varnish_lb_directors.xml</item>
 	</additional_files_needed>
    	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/varnish64/varnish_settings.xml</item>
+	    <item>https://packages.pfsense.org/packages/config/varnish64/varnish_settings.xml</item>
 	</additional_files_needed>
    	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/varnish64/varnish_custom_vcl.xml</item>
+	    <item>https://packages.pfsense.org/packages/config/varnish64/varnish_custom_vcl.xml</item>
 	</additional_files_needed>
    	<additional_files_needed>
 	    <prefix>/usr/local/www/widgets/widgets/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/varnish64/varnish.widget.php</item>
+	    <item>https://packages.pfsense.org/packages/config/varnish64/varnish.widget.php</item>
 	</additional_files_needed>
    	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/varnish64/varnish.inc</item>
+	    <item>https://packages.pfsense.org/packages/config/varnish64/varnish.inc</item>
 	</additional_files_needed>
    	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/varnish64/varnish_sync.xml</item>
+	    <item>https://packages.pfsense.org/packages/config/varnish64/varnish_sync.xml</item>
 	</additional_files_needed>
    	<additional_files_needed>
 	    <prefix>/usr/local/www/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/varnish64/varnish_view_config.php</item>
+	    <item>https://packages.pfsense.org/packages/config/varnish64/varnish_view_config.php</item>
 	</additional_files_needed>
    	<additional_files_needed>
 	    <prefix>/usr/local/www/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/varnish64/varnishstat.php</item>
+	    <item>https://packages.pfsense.org/packages/config/varnish64/varnishstat.php</item>
 	</additional_files_needed>
 	<menu>
 		<name>Varnish</name>
diff --git a/config/varnish64/varnish_lb_directors.xml b/config/varnish64/varnish_lb_directors.xml
index 4c46414e..e7a442ab 100644
--- a/config/varnish64/varnish_lb_directors.xml
+++ b/config/varnish64/varnish_lb_directors.xml
@@ -49,17 +49,17 @@
    	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/varnish64/varnish_settings.xml</item>
+	    <item>https://packages.pfsense.org/packages/config/varnish64/varnish_settings.xml</item>
 	</additional_files_needed>
    	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/varnish64/varnish_custom_vcl.xml</item>
+	    <item>https://packages.pfsense.org/packages/config/varnish64/varnish_custom_vcl.xml</item>
 	</additional_files_needed>
    	<additional_files_needed>
 	    <prefix>/usr/local/pkg/</prefix>
 	    <chmod>0755</chmod>
-	    <item>http://www.pfsense.com/packages/config/varnish64/varnish.inc</item>
+	    <item>https://packages.pfsense.org/packages/config/varnish64/varnish.inc</item>
 	</additional_files_needed>
 	<menu>
 		<name>Varnish </name>
diff --git a/config/varnish64/varnish_view_config.php b/config/varnish64/varnish_view_config.php
index 2e449b51..15c68447 100644
--- a/config/varnish64/varnish_view_config.php
+++ b/config/varnish64/varnish_view_config.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	varnish_view_config.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
 	All rights reserved.
 
diff --git a/config/varnish64/varnishstat.php b/config/varnish64/varnishstat.php
index 6374525a..9fe3d77d 100644
--- a/config/varnish64/varnishstat.php
+++ b/config/varnish64/varnishstat.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	varnishstat_view_logs.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2006 Scott Ullrich <sullrich@gmail.com>
 	All rights reserved.