From 4a371822951cb735d22b700c1018efa4e17a0302 Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Wed, 1 Dec 2021 15:43:11 -0500
Subject: [PATCH] Undraft blog post and switch mirrors
---
i2p2www/__init__.py | 2 +-
....0-Release.draft.rst => 1.6.0-Release.rst} | 0
i2p2www/downloads.py | 33 ++++++++++---------
i2p2www/pages/downloads/macros | 2 +-
4 files changed, 19 insertions(+), 18 deletions(-)
rename i2p2www/blog/2021/11/29/{1.6.0-Release.draft.rst => 1.6.0-Release.rst} (100%)
diff --git a/i2p2www/__init__.py b/i2p2www/__init__.py
index e62cd11d7..9d416da08 100644
--- a/i2p2www/__init__.py
+++ b/i2p2www/__init__.py
@@ -22,7 +22,7 @@ except ImportError:
###########
# Constants
-CURRENT_I2P_VERSION = '1.5.0'
+CURRENT_I2P_VERSION = '1.6.0'
CURRENT_I2P_FIREFOX_PROFILE_VERSION = '1.05.0'
CANONICAL_DOMAIN = 'geti2p.net'
diff --git a/i2p2www/blog/2021/11/29/1.6.0-Release.draft.rst b/i2p2www/blog/2021/11/29/1.6.0-Release.rst
similarity index 100%
rename from i2p2www/blog/2021/11/29/1.6.0-Release.draft.rst
rename to i2p2www/blog/2021/11/29/1.6.0-Release.rst
diff --git a/i2p2www/downloads.py b/i2p2www/downloads.py
index 5a0490505..341da6baf 100644
--- a/i2p2www/downloads.py
+++ b/i2p2www/downloads.py
@@ -7,25 +7,26 @@ from random import randint
from i2p2www import CURRENT_I2P_VERSION, MIRRORS_FILE
-#DEFAULT_MIRROR = {
-# "net": "clearnet",
-# "protocol": "https",
-# "domain": "files.i2p-projekt.de",
-# "path": "/%(version)s/%(file)s",
-# "org": "i2p-projekt",
-# "country": "de",
-#}
-
DEFAULT_MIRROR = {
- "net": "clearnet",
- "protocol": "https",
- "domain": "download.i2p2.de",
- "path": "/releases/%(version)s/%(file)s",
- "org": "sigterm.no",
- "org_url": "https://download.i2p2.de",
- "country": "no",
+ "net": "clearnet",
+ "protocol": "https",
+ "domain": "files.i2p-projekt.de",
+ "path": "/%(version)s/%(file)s",
+ "org": "i2p-projekt",
+ "org_url": "https://files.i2p-projekt.de",
+ "country": "de",
}
+#DEFAULT_MIRROR = {
+# "net": "clearnet",
+# "protocol": "https",
+# "domain": "download.i2p2.de",
+# "path": "/releases/%(version)s/%(file)s",
+# "org": "sigterm.no",
+# "org_url": "https://download.i2p2.de",
+# "country": "no",
+#}
+
#{
# 'net': 'clearnet',
# 'protocol': 'https',
diff --git a/i2p2www/pages/downloads/macros b/i2p2www/pages/downloads/macros
index 61a4b9e2a..5707ba87c 100644
--- a/i2p2www/pages/downloads/macros
+++ b/i2p2www/pages/downloads/macros
@@ -8,7 +8,7 @@
{% set i2p_windows_subver = '' %}
{% set i2p_macosx_launcher_version = '0.1.8' %}
-{% set i2p_android_version = '1.5.0' %}
+{% set i2p_android_version = '1.6.0' %}
{% set i2p_android_version_kytv = '0.9.22' %}
{% set i2p_android_version_fdroid = '0.9.47-1' %}
--
GitLab