Merge branch 'master' into catalyst

apps/reader/views.py

@@ -671,6 +671,10 @@ def load_single_feed(request, feed_id):
     if feed.is_newsletter and not usersub:
         # User must be subscribed to a newsletter in order to read it
         raise Http404
+
+    if feed.num_subscribers == 1 and not usersub and not user.is_staff:
+        # This feed could be private so user must be subscribed in order to read it
+        raise Http404
     
     if page > 400:
         logging.user(request, "~BR~FK~SBOver page 400 on single feed: %s" % page)

docker/haproxy/haproxy.consul.cfg.j2

@@ -178,7 +178,10 @@ backend node_favicons
     http-check expect rstatus 200|503
     option httpchk GET /rss_feeds/icon/1
     balance roundrobin
-    server-template node-favicons 1 _node-favicons._tcp.service.nyc1.consul:8008 check inter 2000ms resolvers consul resolve-prefer ipv4 resolve-opts allow-dup-ip init-addr none
+    default-server check inter 2000ms resolvers consul resolve-prefer ipv4 resolve-opts allow-dup-ip init-addr none
+    {% for host in groups.node_favicons %}
+        server {{host}} {{host}}.node.nyc1.consul:8008
+    {% endfor %}
 
 backend node_text
     http-check expect rstatus 200|503

docker/newsblur_deploy.Dockerfile

@@ -6,7 +6,7 @@ RUN apt install -y curl
 
 # Install Java
 # Install OpenJDK-11
-RUN apt install -y openjdk-11-jre-headless
+RUN apt install -y default-jre
 ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64/
 RUN export JAVA_HOME
 WORKDIR /tmp