Fixup URLs:

- Replace http by https
- *.pfsense.com -> *.pfsense.org
- www.pfsense.org/packages/config -> packages.pfsense.org/packages/config

3 files changed, 16 insertions, 16 deletions

diff --git a/config/mailscanner/mailscanner.inc b/config/mailscanner/mailscanner.inc
index 9f5fd11d..0147bb2e 100644
--- a/config/mailscanner/mailscanner.inc
+++ b/config/mailscanner/mailscanner.inc
@@ -134,7 +134,7 @@ function sync_package_mailscanner($via_rpc=false) {
 	#General options
 	$info  =($mailscanner['orgname']?'%org-name% = '.$mailscanner['orgname']."\n":'%org-name% = Pfsense'."\n");
 	$info .=($mailscanner['longorgname']?'%org-long-name% = '.$mailscanner['longorgname']."\n":'%org-long-name% = Pfsense Inc.'."\n");
-	$info .=($mailscanner['website']?'%web-site% = '.$mailscanner['website']."\n":'%web-site% = www.pfsense.com'."\n");
+	$info .=($mailscanner['website']?'%web-site% = '.$mailscanner['website']."\n":'%web-site% = www.pfsense.org'."\n");
 	$max_children =($mailscanner['max_children']?$mailscanner['max_children']:'5');
 	$scan_messages=(preg_match('/ScanMessages/',$mailscanner['pim'])?"yes":"no");
 	$reject_message=(preg_match('/RejectMessage/',$mailscanner['pim'])?"yes":"no");
diff --git a/config/mailscanner/mailscanner.xml b/config/mailscanner/mailscanner.xml
index 2f97fcec..a7115a5c 100644
--- a/config/mailscanner/mailscanner.xml
+++ b/config/mailscanner/mailscanner.xml
@@ -58,64 +58,64 @@
 		<description>MailScanner</description>
 	</service>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/mailscanner/mailscanner.inc</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/mailscanner.inc</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/mailscanner/mailscanner.xml</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/mailscanner.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/mailscanner/mailscanner_report.xml</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/mailscanner_report.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/mailscanner/mailscanner_antispam.xml</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/mailscanner_antispam.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/mailscanner/mailscanner_alerts.xml</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/mailscanner_alerts.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/mailscanner/mailscanner_antivirus.xml</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/mailscanner_antivirus.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/mailscanner/mailscanner_attachments.xml</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/mailscanner_attachments.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/mailscanner/mailscanner_content.xml</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/mailscanner_content.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/mailscanner/mailscanner_sync.xml</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/mailscanner_sync.xml</item>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/mailscanner/mailscanner_about.php</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/mailscanner_about.php</item>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>0755</chmod>
 	</additional_files_needed>
 	<additional_files_needed>
-		<item>http://www.pfsense.org/packages/config/mailscanner/mailscanner.conf.template</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/mailscanner.conf.template</item>
 		<prefix>/usr/local/pkg/</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/mailscanner/pkg_mailscanner.inc</item>
+		<item>https://packages.pfsense.org/packages/config/mailscanner/pkg_mailscanner.inc</item>
 	</additional_files_needed>
 <tabs>
 		<tab>
diff --git a/config/mailscanner/mailscanner_about.php b/config/mailscanner/mailscanner_about.php
index c3408906..9277a3a7 100755
--- a/config/mailscanner/mailscanner_about.php
+++ b/config/mailscanner/mailscanner_about.php
@@ -1,7 +1,7 @@
 <?php
 /*
 	mailscanner_about.php
-	part of pfSense (http://www.pfsense.com/)
+	part of pfSense (https://www.pfsense.org/)
 	Copyright (C) 2011 Marcello Coutinho <marcellocoutinho@gmail.com>
 	All rights reserved.
 
@@ -95,11 +95,11 @@ include("head.inc");
 						</tr>
 						<tr>
                         <td width="22%" valign="top" class="vncell"><?=gettext("Credits ");?></td>
-                        <td width="78%" class="vtable"><?=gettext("Package 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 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>