From 7f93fa4a68defb6d4ac868d96ce698255f917307 Mon Sep 17 00:00:00 2001 From: bqbn Date: Fri, 8 Jul 2016 19:24:40 -0700 Subject: [PATCH] Bugzilla 1245540 move outgoing to cloudops (#3060) * Change REDIRECT_URL hostname to the AWS install * Wrap the line to make flake8 happy --- src/olympia/addons/tests/test_models.py | 2 +- src/olympia/amo/fixtures/base/addon_3615.json | 2 +- src/olympia/amo/fixtures/base/addontag.json | 2 +- src/olympia/amo/helpers.py | 2 +- src/olympia/amo/urlresolvers.py | 3 ++- src/olympia/conf/dev/settings.py | 2 +- src/olympia/conf/stage/settings.py | 2 +- src/olympia/lib/settings_base.py | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/olympia/addons/tests/test_models.py b/src/olympia/addons/tests/test_models.py index 9c694f03e5..e7c79a8097 100644 --- a/src/olympia/addons/tests/test_models.py +++ b/src/olympia/addons/tests/test_models.py @@ -2361,7 +2361,7 @@ class TestAddonFromUpload(UploadTest): assert addon.default_locale == 'en-US' -REDIRECT_URL = 'https://outgoing.mozilla.org/v1/' +REDIRECT_URL = 'https://outgoing.prod.mozaws.net/v1/' class TestCharity(TestCase): diff --git a/src/olympia/amo/fixtures/base/addon_3615.json b/src/olympia/amo/fixtures/base/addon_3615.json index b05d701046..7cab556ae8 100644 --- a/src/olympia/amo/fixtures/base/addon_3615.json +++ b/src/olympia/amo/fixtures/base/addon_3615.json @@ -66,7 +66,7 @@ "locale": "en-US", "modified": "2009-04-29 11:20:57", "id": 15002, - "localized_string_clean": "This extension integrates your browser with Delicious (http://delicious.com), the leading social bookmarking service on the Web." + "localized_string_clean": "This extension integrates your browser with Delicious (http://delicious.com), the leading social bookmarking service on the Web." } }, { diff --git a/src/olympia/amo/fixtures/base/addontag.json b/src/olympia/amo/fixtures/base/addontag.json index 4e8e221370..ddcd619fcf 100644 --- a/src/olympia/amo/fixtures/base/addontag.json +++ b/src/olympia/amo/fixtures/base/addontag.json @@ -3,7 +3,7 @@ "pk": 602710, "model": "translations.translation", "fields": { - "localized_string_clean": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044e\u044e \u0432\u0435\u0440\u0441\u0438\u044e 1.32.3 \u043e\u0442 19.02.2010 \u0433. \u043c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0432 \u0442\u0435\u043c\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0438 \u043d\u0430 \u0444\u043e\u0440\u0443\u043c\u0435 \u0431\u0438\u0440\u0436\u0438.", + "localized_string_clean": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044e\u044e \u0432\u0435\u0440\u0441\u0438\u044e 1.32.3 \u043e\u0442 19.02.2010 \u0433. \u043c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0432 \u0442\u0435\u043c\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0438 \u043d\u0430 \u0444\u043e\u0440\u0443\u043c\u0435 \u0431\u0438\u0440\u0436\u0438.", "created": "2009-09-16 04:58:49", "locale": "ru", "modified": "2010-02-19 07:36:18", diff --git a/src/olympia/amo/helpers.py b/src/olympia/amo/helpers.py index 177b56866b..58d5fa8b9c 100644 --- a/src/olympia/amo/helpers.py +++ b/src/olympia/amo/helpers.py @@ -365,7 +365,7 @@ def strip_html(s, just_kidding=False): @register.filter def external_url(url): - """Bounce a URL off outgoing.mozilla.org.""" + """Bounce a URL off outgoing.prod.mozaws.net.""" return urlresolvers.get_outgoing_url(unicode(url)) diff --git a/src/olympia/amo/urlresolvers.py b/src/olympia/amo/urlresolvers.py index 43e711ffb2..0a8b4d5090 100644 --- a/src/olympia/amo/urlresolvers.py +++ b/src/olympia/amo/urlresolvers.py @@ -176,7 +176,8 @@ class Prefixer(object): def get_outgoing_url(url): """ - Bounce a URL off an outgoing URL redirector, such as outgoing.mozilla.org. + Bounce a URL off an outgoing URL redirector, such as + outgoing.prod.mozaws.net. """ if not settings.REDIRECT_URL: return url diff --git a/src/olympia/conf/dev/settings.py b/src/olympia/conf/dev/settings.py index 7f1b8c3d7c..f378a5bf4f 100644 --- a/src/olympia/conf/dev/settings.py +++ b/src/olympia/conf/dev/settings.py @@ -166,7 +166,7 @@ CEF_PRODUCT = STATSD_PREFIX NEW_FEATURES = True -REDIRECT_URL = 'https://outgoing.allizom.org/v1/' +REDIRECT_URL = 'https://outgoing.stage.mozaws.net/v1/' CLEANCSS_BIN = 'cleancss' UGLIFY_BIN = 'uglifyjs' diff --git a/src/olympia/conf/stage/settings.py b/src/olympia/conf/stage/settings.py index 6342055e07..9d746ea729 100644 --- a/src/olympia/conf/stage/settings.py +++ b/src/olympia/conf/stage/settings.py @@ -160,7 +160,7 @@ CEF_PRODUCT = STATSD_PREFIX NEW_FEATURES = True -REDIRECT_URL = 'https://outgoing.allizom.org/v1/' +REDIRECT_URL = 'https://outgoing.stage.mozaws.net/v1/' CLEANCSS_BIN = 'cleancss' UGLIFY_BIN = 'uglifyjs' diff --git a/src/olympia/lib/settings_base.py b/src/olympia/lib/settings_base.py index 9fe61288d1..ad8347c4bf 100644 --- a/src/olympia/lib/settings_base.py +++ b/src/olympia/lib/settings_base.py @@ -937,7 +937,7 @@ NEW_PERSONAS_UPDATE_URL = VAMO_URL + '/%(locale)s/themes/update-check/%(id)d' # Outgoing URL bouncer -REDIRECT_URL = 'https://outgoing.mozilla.org/v1/' +REDIRECT_URL = 'https://outgoing.prod.mozaws.net/v1/' REDIRECT_SECRET_KEY = '' # Allow URLs from these servers. Use full domain names.