Bugzilla 1245540 move outgoing to cloudops (#3060)

* Change REDIRECT_URL hostname to the AWS install

* Wrap the line to make flake8 happy
This commit is contained in:
bqbn 2016-07-08 19:24:40 -07:00 коммит произвёл GitHub
Родитель c622c7b255
Коммит 7f93fa4a68
8 изменённых файлов: 9 добавлений и 8 удалений

Просмотреть файл

@ -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):

Просмотреть файл

@ -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 (<a href=\"https://outgoing.mozilla.org/v1/a7340d008b54ff0918a3557cf5d67290465ab799/http%3A//delicious.com\">http://delicious.com</a>), the leading social bookmarking service on the Web."
"localized_string_clean": "This extension integrates your browser with Delicious (<a href=\"https://outgoing.prod.mozaws.net/v1/a7340d008b54ff0918a3557cf5d67290465ab799/http%3A//delicious.com\">http://delicious.com</a>), the leading social bookmarking service on the Web."
}
},
{

Просмотреть файл

@ -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 <b>1.32.3 \u043e\u0442 19.02.2010 \u0433.</b> \u043c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c <a href=\"https://outgoing.mozilla.org/v1/cc080f3c21281baed85f65e4c6615c307f2528b9/http%3A//forum.sape.ru/showthread.php%3Ft%3D17226\">\u0432 \u0442\u0435\u043c\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0438</a> \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 <b>1.32.3 \u043e\u0442 19.02.2010 \u0433.</b> \u043c\u043e\u0436\u043d\u043e \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c <a href=\"https://outgoing.prod.mozaws.net/v1/cc080f3c21281baed85f65e4c6615c307f2528b9/http%3A//forum.sape.ru/showthread.php%3Ft%3D17226\">\u0432 \u0442\u0435\u043c\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0438</a> \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",

Просмотреть файл

@ -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))

Просмотреть файл

@ -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

Просмотреть файл

@ -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'

Просмотреть файл

@ -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'

Просмотреть файл

@ -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.