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

Conflicts:
	config/haproxy-devel/haproxy.inc

7 files changed, 24 insertions, 24 deletions

diff --git a/config/postfix/postfix.php b/config/postfix/postfix.php
index 78eb551d..774c7573 100644
--- a/config/postfix/postfix.php
+++ b/config/postfix/postfix.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	postfix.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2011-2013 Marcello Coutinho <marcellocoutinho@gmail.com>
 	based on varnish_view_config.
 	All rights reserved.
diff --git a/config/postfix/postfix.widget.php b/config/postfix/postfix.widget.php
index 70051c1d..b7fc7af9 100755
--- a/config/postfix/postfix.widget.php
+++ b/config/postfix/postfix.widget.php
@@ -1,7 +1,7 @@
 <?php 
 /*
         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/postfix/postfix.xml b/config/postfix/postfix.xml
index e9d2d953..59e58f41 100644
--- a/config/postfix/postfix.xml
+++ b/config/postfix/postfix.xml
@@ -71,84 +71,84 @@
 		<executable>master</executable>
 	</service>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix.inc</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix.inc</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_acl.xml</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix_acl.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_domains.xml</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix_domains.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_recipients.xml</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix_recipients.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_antispam.xml</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix_antispam.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_sync.xml</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix_sync.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 		<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_view_config.php</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix_view_config.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_recipients.php</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix_recipients.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_search.php</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix_search.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix.php</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix.widget.php</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix.widget.php</item>
 		<prefix>/usr/local/www/widgets/widgets/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_about.php</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix_about.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix_queue.php</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix_queue.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/postfix.priv.inc</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/postfix.priv.inc</item>
 		<prefix>/etc/inc/priv/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/postfix/adexport.pl</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/adexport.pl</item>
 		<prefix>/usr/local/bin/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 		<additional_files_needed>
 		<prefix>/usr/local/www/shortcuts/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/postfix/pkg_postfix.inc</item>
+		<item>https://packages.pfsense.org/packages/config/postfix/pkg_postfix.inc</item>
 	</additional_files_needed>
 <tabs>
 		<tab>
diff --git a/config/postfix/postfix_about.php b/config/postfix/postfix_about.php
index 56645646..b7d04d16 100755
--- a/config/postfix/postfix_about.php
+++ b/config/postfix/postfix_about.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	postfix_about.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2011-2013 Marcello Coutinho <marcellocoutinho@gmail.com>
 	based on varnish_view_config.
 	All rights reserved.
@@ -78,11 +78,11 @@ include("head.inc");
 						</tr>
 						<tr>
                         <td width="22%" valign="top" class="vncell"><?=gettext("Credits ");?></td>
-                        <td width="78%" class="vtable"><?=gettext("Package v2 Created by <a target=_new href='http://forum.pfsense.org/index.php?action=profile;u=4710'>Marcello Coutinho</a><br><br>");?></td>
+                        <td width="78%" class="vtable"><?=gettext("Package v2 Created by <a target=_new href='https://forum.pfsense.org/index.php?action=profile;u=4710'>Marcello Coutinho</a><br><br>");?></td>
                         </tr>
 						<tr>
                         <td width="22%" valign="top" class="vncell"><?=gettext("Donatios ");?></td>
-                        <td width="78%" class="vtable"><?=gettext("If you like this package, please <a target=_new href='http://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to pfSense project</a>.<br><br>
+                        <td width="78%" class="vtable"><?=gettext("If you like this package, please <a target=_new href='https://www.pfsense.org/index.php?option=com_content&task=view&id=47&Itemid=77'>donate to pfSense project</a>.<br><br>
 								 If you want that your donation goes to this package developer, make a note on donation forwarding it to me.<br><br>");?></td>
                         </tr>
 						</table>
diff --git a/config/postfix/postfix_queue.php b/config/postfix/postfix_queue.php
index f60ac83e..bf6e956c 100755
--- a/config/postfix/postfix_queue.php
+++ b/config/postfix/postfix_queue.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	postfix_view_config.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2011-2013 Marcello Coutinho <marcellocoutinho@gmail.com>
 	based on varnish_view_config.
 	All rights reserved.
diff --git a/config/postfix/postfix_search.php b/config/postfix/postfix_search.php
index 85648287..78d79869 100755
--- a/config/postfix/postfix_search.php
+++ b/config/postfix/postfix_search.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	postfix_search.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2011-2013 Marcello Coutinho <marcellocoutinho@gmail.com>
 	based on varnish_view_config.
 	All rights reserved.
diff --git a/config/postfix/postfix_view_config.php b/config/postfix/postfix_view_config.php
index 59deb11e..c3efda53 100644
--- a/config/postfix/postfix_view_config.php
+++ b/config/postfix/postfix_view_config.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	postfix_view_config.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2011-2013 Marcello Coutinho <marcellocoutinho@gmail.com>
 	based on varnish_view_config.
 	All rights reserved.