Merge branch '2.0' into 2.1.

9 files changed, 12 insertions, 12 deletions

diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index 61963fef1..9ea7af0fc 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -14,6 +14,6 @@ Version | Supported
 
 ## Reporting a Vulnerability
 
-Please do not report security vulnerabilities on GitHub. Instead, email the details to team@anope.org or get the attention of a developer in our development IRC channel at irc.anope.org #anope-devel and PM them the details.
+Please do not report security vulnerabilities on GitHub. Instead, email the details to team@anope.org or get the attention of a developer in our development IRC channel at irc.teranova.net #anope-devel and PM them the details.
 
 We will triage your issue as soon as possible and try to release a fixed version within a week of receiving your report.
diff --git a/README.md b/README.md
index 9a6886519..32fde658b 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Anope is an open source set of IRC services. It is highly modular, with a vast n
 
 * [Website](https://anope.org)
 * [GitHub](https://github.com/anope)
-* IRC \#anope on irc.anope.org
+* IRC \#anope on irc.teranova.net
 
 ## Installation
 
@@ -33,7 +33,7 @@ Copy conf/anope.example.conf to conf/anope.conf
 $ cp conf/anope.example.conf conf/anope.conf
 ```
 
-Edit anope.conf, configuring the uplink, serverinfo, and protocol module configurations. Example link blocks for popular IRCds are included in the anope.example.conf documentation. The [Anope wiki](https://wiki.anope.org) is also a good source of information. Our support channel is located at #anope on [irc.anope.org](irc://irc.anope.org/#anope).
+Edit anope.conf, configuring the uplink, serverinfo, and protocol module configurations. Example link blocks for popular IRCds are included in the the example.conf documentation. The [Anope wiki](https://wiki.anope.org) is also a good source of information. Our support channel is located at #anope on [irc.teranova.net](ircs://irc.teranova.net/anope).
 
 Note that the example configuration file includes other example configuration files. If you want to modify the other example configuration files, copy them (e.g. `modules.example.conf` to `modules.conf`) and modify the `include` directive in `anope.conf` to include the new file.
 
diff --git a/docs/DEFCON b/docs/DEFCON
index 44510e05e..16fe2388b 100644
--- a/docs/DEFCON
+++ b/docs/DEFCON
@@ -90,4 +90,4 @@ Anope DefCon
 6) Support
 
     You might get DefCon support by posting on our online forum, or maybe on
-    our #anope channel at /server irc.anope.org.
+    our #anope channel at /server irc.teranova.net.
diff --git a/docs/INSTALL b/docs/INSTALL
index 2a643429a..01f04e829 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -60,7 +60,7 @@ Note: You should also read the README and FAQ files!
     most likely not work!
 
     If you need help, you should visit https://forum.anope.org/ or #anope on
-    irc.anope.org. Provide *complete* error output, along with other relevant
+    irc.teranova.net. Provide *complete* error output, along with other relevant
     information eg. OS, compiler and C++ library versions.
     See the README file for more information.
 
diff --git a/docs/INSTALL.fr b/docs/INSTALL.fr
index bdfbccc53..b27b32187 100644
--- a/docs/INSTALL.fr
+++ b/docs/INSTALL.fr
@@ -64,7 +64,7 @@ Note : Vous devrez également lire les fichiers README et FAQ !
     recommandée, et Anope ne fonctionnera probablement pas !
 
     Si vous avez besoin d'aide, vous pouvez aller sur le site
-    https://forum.anope.org/ ou le canal #anope sur irc.anope.org.
+    https://forum.anope.org/ ou le canal #anope sur irc.teranova.net.
     Fournissez *l'essemble* des erreurs qui apparaîssent, en plus de
     toutes informations utiles, comme les versions de votre OS, du
     compilateur utilisé et de la librairie C++. Lisez le fichier README
diff --git a/docs/MODULES b/docs/MODULES
index 4edf509db..e22ab3d7d 100644
--- a/docs/MODULES
+++ b/docs/MODULES
@@ -111,7 +111,7 @@ Anope Modules
     Use modules at your own risk, and make sure you get them from a
     reputable source. You might get module support by contacting the module
     author, posting on our online forum, or maybe on our #anope channel
-    at /server irc.anope.org.
+    at /server irc.teranova.net.
 
 7) Information for Developers
 
diff --git a/docs/README b/docs/README
index 3ab7e0def..f1c69d4ac 100644
--- a/docs/README
+++ b/docs/README
@@ -245,7 +245,7 @@ Table of Contents
 
     If you read the documentation carefully, and didn't find the answer to
     your question, feel free to post on the website forums or join our irc
-    channel (irc.anope.org #anope). Once you join our Support channel be as
+    channel (irc.teranova.net #anope). Once you join our Support channel be as
     precise as possible when asking a question, because we have no extraordinary
     powers and can't guess things if they aren't provided.
 
diff --git a/src/init.cpp b/src/init.cpp
index 49b38dc22..309bb3117 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -337,7 +337,7 @@ bool Anope::Init(int ac, char **av)
 		Log(LOG_TERMINAL) << "-v, --version";
 		Log(LOG_TERMINAL) << "";
 		Log(LOG_TERMINAL) << "Further support is available from https://www.anope.org/";
-		Log(LOG_TERMINAL) << "Or visit us on IRC at irc.anope.org #anope";
+		Log(LOG_TERMINAL) << "Or visit us on IRC at irc.teranova.net #anope";
 		Anope::ReturnValue = EXIT_SUCCESS;
 		return false;
 	}
@@ -488,7 +488,7 @@ bool Anope::Init(int ac, char **av)
 		Log(LOG_TERMINAL) << "*** Support resources: Read through the anope.conf self-contained";
 		Log(LOG_TERMINAL) << "*** documentation. Read the documentation files found in the 'docs'";
 		Log(LOG_TERMINAL) << "*** folder. Visit our portal located at https://www.anope.org/. Join";
-		Log(LOG_TERMINAL) << "*** our support channel on /server irc.anope.org channel #anope.";
+		Log(LOG_TERMINAL) << "*** our support channel on /server irc.teranova.net channel #anope.";
 		throw CoreException("Configuration file failed to validate");
 	}
 
diff --git a/src/tools/geoipupdate.sh b/src/tools/geoipupdate.sh
index 5e6d9873e..db6e61d8d 100755
--- a/src/tools/geoipupdate.sh
+++ b/src/tools/geoipupdate.sh
@@ -24,8 +24,8 @@ die="yes"
 ###########################
 
 # The GeoIP data is created by MaxMind, available from www.maxmind.com.
-geoip_country_source="https://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip"
-geoip_city_source="https://geolite.maxmind.com/download/geoip/database/GeoLiteCity_CSV/GeoLiteCity-latest.zip"
+geoip_country_source="https://mirrors-cdn.liferay.com/geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip"
+geoip_city_source="https://mirrors-cdn.liferay.com/geolite.maxmind.com/download/geoip/database/GeoLiteCity-latest.zip"
 geoip_region_source="https://www.maxmind.com/download/geoip/misc/region_codes.csv"
 
 ###########################