From 133a4658ee678daa6218dd48764674c026353085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 7 Dec 2017 16:35:01 +0100 Subject: [PATCH] Switch to https for (plugins.)octoprint.org Also add utm tags to the two support-octoprint links so we have a chance to see if anyone ever actually clicks on those. --- src/octoprint/plugins/announcements/__init__.py | 10 +++++----- .../templates/corewizard_pluginblacklist_wizard.jinja2 | 2 +- .../templates/octopi_support_about.jinja2 | 2 +- src/octoprint/plugins/pluginmanager/__init__.py | 4 ++-- .../templates/pluginmanager_settings.jinja2 | 2 +- src/octoprint/settings.py | 2 +- src/octoprint/templates/dialogs/about/about.jinja2 | 4 ++-- .../templates/dialogs/settings/features.jinja2 | 2 +- .../templates/dialogs/wizard/firstrun_end.jinja2 | 2 +- src/octoprint/templates/index.jinja2 | 2 +- .../server/serverPluginBlacklistDescription.jinja2 | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/octoprint/plugins/announcements/__init__.py b/src/octoprint/plugins/announcements/__init__.py index 668bc3cd..c5d6935b 100644 --- a/src/octoprint/plugins/announcements/__init__.py +++ b/src/octoprint/plugins/announcements/__init__.py @@ -60,27 +60,27 @@ class AnnouncementPlugin(octoprint.plugin.AssetPlugin, description="Important announcements about OctoPrint.", priority=1, type="rss", - url="http://octoprint.org/feeds/important.xml"), + url="https://octoprint.org/feeds/important.xml"), _releases=dict(name="Release Announcements", description="Announcements of new releases and release candidates of OctoPrint.", priority=2, type="rss", - url="http://octoprint.org/feeds/releases.xml"), + url="https://octoprint.org/feeds/releases.xml"), _blog=dict(name="On the OctoBlog", description="Development news, community spotlights, OctoPrint On Air episodes and more from the official OctoBlog.", priority=2, type="rss", - url="http://octoprint.org/feeds/octoblog.xml"), + url="https://octoprint.org/feeds/octoblog.xml"), _plugins=dict(name="New Plugins in the Repository", description="Announcements of new plugins released on the official Plugin Repository.", priority=2, type="rss", - url="http://plugins.octoprint.org/feed.xml"), + url="https://plugins.octoprint.org/feed.xml"), _octopi=dict(name="OctoPi News", description="News around OctoPi, the Raspberry Pi image including OctoPrint.", priority=2, type="rss", - url="http://octoprint.org/feeds/octopi.xml")), + url="https://octoprint.org/feeds/octopi.xml")), enabled_channels=[], forced_channels=["_important"], channel_order=["_important", "_releases", "_blog", "_plugins", "_octopi"], diff --git a/src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2 b/src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2 index 5c6eebbe..744bcbc0 100644 --- a/src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2 +++ b/src/octoprint/plugins/corewizard/templates/corewizard_pluginblacklist_wizard.jinja2 @@ -6,7 +6,7 @@ normal operation, allowing you to uninstall or update them to a newer version. {% endtrans %}

-

{% trans url="http://plugins.octoprint.org/blacklist/" %} +

{% trans url="https://plugins.octoprint.org/blacklist/" %} By default, OctoPrint will use the blacklist hosted at plugins.octoprint.org/blacklist.json which you can also take a look at in a more human readable format here. {% endtrans %}

diff --git a/src/octoprint/plugins/octopi_support/templates/octopi_support_about.jinja2 b/src/octoprint/plugins/octopi_support/templates/octopi_support_about.jinja2 index 5e0212b3..6dcb2d67 100644 --- a/src/octoprint/plugins/octopi_support/templates/octopi_support_about.jinja2 +++ b/src/octoprint/plugins/octopi_support/templates/octopi_support_about.jinja2 @@ -5,7 +5,7 @@

Version {{ plugin_octopi_support_version }}

diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py index c8ef95b9..2ee271bb 100644 --- a/src/octoprint/plugins/pluginmanager/__init__.py +++ b/src/octoprint/plugins/pluginmanager/__init__.py @@ -117,9 +117,9 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin, def get_settings_defaults(self): return dict( - repository="http://plugins.octoprint.org/plugins.json", + repository="https://plugins.octoprint.org/plugins.json", repository_ttl=24*60, - notices="http://plugins.octoprint.org/notices.json", + notices="https://plugins.octoprint.org/notices.json", notices_ttl=6*60, pip_args=None, pip_force_user=False, diff --git a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 index 4dc8b2ae..6541c2b5 100644 --- a/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 +++ b/src/octoprint/plugins/pluginmanager/templates/pluginmanager_settings.jinja2 @@ -133,7 +133,7 @@ {{ pluginmanager_safemode() }} {{ pluginmanager_offline() }}

- {{ _('... from the Plugin Repository', url='http://plugins.octoprint.org') }} + {{ _('... from the Plugin Repository', url='https://plugins.octoprint.org') }}
diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py index 350c63bf..081fbfd7 100644 --- a/src/octoprint/settings.py +++ b/src/octoprint/settings.py @@ -159,7 +159,7 @@ default_settings = { }, "pluginBlacklist": { "enabled": None, - "url": "http://plugins.octoprint.org/blacklist.json", + "url": "https://plugins.octoprint.org/blacklist.json", "ttl": 15 * 60 # 15 min }, "diskspace": { diff --git a/src/octoprint/templates/dialogs/about/about.jinja2 b/src/octoprint/templates/dialogs/about/about.jinja2 index 1569f2ca..5870d688 100644 --- a/src/octoprint/templates/dialogs/about/about.jinja2 +++ b/src/octoprint/templates/dialogs/about/about.jinja2 @@ -5,14 +5,14 @@

Version {{ display_version }}

Development of OctoPrint wouldn't be possible without its supporters.
- If you enjoy OctoPrint, please consider supporting its ongoing development. + If you enjoy OctoPrint, please consider supporting its ongoing development.

diff --git a/src/octoprint/templates/dialogs/settings/features.jinja2 b/src/octoprint/templates/dialogs/settings/features.jinja2 index 90accd65..f0a2019f 100644 --- a/src/octoprint/templates/dialogs/settings/features.jinja2 +++ b/src/octoprint/templates/dialogs/settings/features.jinja2 @@ -3,7 +3,7 @@