Fixup URLs:

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

3 files changed, 25 insertions, 25 deletions

diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml
index 146918d3..b7336e98 100644
--- a/config/countryblock/countryblock.xml
+++ b/config/countryblock/countryblock.xml
@@ -39,7 +39,7 @@
 		</copyright>
 	<description>Country Block</description>
 	<requirements>Active Internet</requirements>
-	<faq>http://forum.pfsense.org/index.php/topic,25732.0.html</faq>
+	<faq>https://forum.pfsense.org/index.php/topic,25732.0.html</faq>
 	<name>Country Block Settings</name>
 	<version>0.2.4</version>
 	<title>Settings</title>
@@ -62,112 +62,112 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.xml</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/countryblock.xml</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.inc</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/countryblock.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/interfaces.txt</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/interfaces.txt</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/countryblock.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/execute.sh</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/execute.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/countryblock.sh</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/countryblock.sh</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/index.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/index.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/ddaccordion.js</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/ddaccordion.js</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/jquery.min.js</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/jquery.min.js</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/public_smo_scripts.js</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/public_smo_scripts.js</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/titlebar.png</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/titlebar.png</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/titlebar-active.png</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/titlebar-active.png</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/purge.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/purge.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/whitelist.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/whitelist.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/countryblock_if.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/countryblock_if.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/firewall_shaper.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/firewall_shaper.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/help.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/help.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/settings.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/settings.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/class.phpmailer.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/class.phpmailer.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/class.smtp.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/class.smtp.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0755</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/email.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/email.tmp</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/tmp/</prefix>
 		<chmod>0644</chmod>
-		<item>http://www.pfsense.org/packages/config/countryblock/countryblock_IPBlocklist.widget.tmp</item>
+		<item>https://packages.pfsense.org/packages/config/countryblock/countryblock_IPBlocklist.widget.tmp</item>
 	</additional_files_needed>
 	<fields>
 		<field>
diff --git a/config/countryblock/countryblock_IPBlocklist.widget.tmp b/config/countryblock/countryblock_IPBlocklist.widget.tmp
index 0ad1573b..59911f5a 100644
--- a/config/countryblock/countryblock_IPBlocklist.widget.tmp
+++ b/config/countryblock/countryblock_IPBlocklist.widget.tmp
@@ -1,7 +1,7 @@
 <?php
 /*
         Copyright 2012 Thomas Schaefer - Tomschaefer.org
-        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/countryblock/help.tmp b/config/countryblock/help.tmp
index 2f466947..577a7f49 100644
--- a/config/countryblock/help.tmp
+++ b/config/countryblock/help.tmp
@@ -91,7 +91,7 @@ To run countryblock as a cron job use /usr/local/etc/rc.d/countryblock.sh <br>
 
 <span style="color:red">Warning!</span> - Apply after every firewall change or state reset. Use at your own risk. 
 --->
-<a href="http://doc.pfsense.org/index.php/Country_Block">Please see wiki for help</a> or the <a href="http://forum.pfsense.org/index.php/topic,25732.0.html">Forum</a>
+<a href="https://doc.pfsense.org/index.php/Country_Block">Please see wiki for help</a> or the <a href="https://forum.pfsense.org/index.php/topic,25732.0.html">Forum</a>
 
 </div>