diff --git a/apps/reader/views.py b/apps/reader/views.py index 4c2a0551b..4c5dcce32 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -844,8 +844,9 @@ def load_feed_page(request, feed_id): if feed and feed.has_page and not feed.has_page_exception: if settings.BACKED_BY_AWS.get('pages_on_node'): - url = "http://%s/original_page/%s" % ( - settings.ORIGINAL_PAGE_SERVER, + domain = Site.objects.get_current().domain + url = "https://%s/original_page/%s" % ( + domain, feed.pk, ) try: diff --git a/apps/rss_feeds/page_importer.py b/apps/rss_feeds/page_importer.py index 5ffba1fa3..4e2904e25 100644 --- a/apps/rss_feeds/page_importer.py +++ b/apps/rss_feeds/page_importer.py @@ -303,8 +303,9 @@ class PageImporter(object): return feed_page def save_page_node(self, html): - url = "http://%s/original_page/%s" % ( - settings.ORIGINAL_PAGE_SERVER, + domain = Site.objects.get_current().domain + url = "https://%s/original_page/%s" % ( + domain, self.feed.pk, ) response = requests.post(url, files={ diff --git a/newsblur_web/docker_local_settings.py b/newsblur_web/docker_local_settings.py index c02e556a9..57e091efe 100644 --- a/newsblur_web/docker_local_settings.py +++ b/newsblur_web/docker_local_settings.py @@ -128,7 +128,6 @@ BACKED_BY_AWS = { 'icons_on_s3': False, } -ORIGINAL_PAGE_SERVER = "node" # =========== # = Logging = diff --git a/newsblur_web/local_settings.py.template b/newsblur_web/local_settings.py.template index 59d2bf13b..273a9cb2a 100644 --- a/newsblur_web/local_settings.py.template +++ b/newsblur_web/local_settings.py.template @@ -129,7 +129,6 @@ BACKED_BY_AWS = { 'icons_on_s3': False, } -ORIGINAL_PAGE_SERVER = "127.0.0.1:3060" # =========== # = Logging = diff --git a/newsblur_web/settings.py b/newsblur_web/settings.py index ff40d8562..adc863f4c 100644 --- a/newsblur_web/settings.py +++ b/newsblur_web/settings.py @@ -565,7 +565,6 @@ YOUTUBE_API_KEY = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" # = AWS Backing = # =============== -ORIGINAL_PAGE_SERVER = "db_pages:3060" BACKED_BY_AWS = { 'pages_on_s3': False,