Switch to newsblur

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "dotdrop"]
 	path = dotdrop
 	url = https://github.com/deadc0de6/dotdrop.git
+[submodule "docker/newsblur/NewsBlur"]
+	path = docker/newsblur/NewsBlur
+	url = https://github.com/samuelclay/NewsBlur.git

docker/newsblur/NewsBlur

@@ -0,0 +1 @@
+Subproject commit d0f15ab141b5a51db38a7947e3e484cd366fac07

docker/newsblur/docker-compose.yml

@@ -0,0 +1,75 @@
+version: "2"
+services:
+  newsblur:
+    container_name: newsblur
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+    image: newsblur
+    links:
+      - mongo-nb
+      - postgres-nb
+      - elasticsearch-nb
+      - redis-nb
+    ports:
+      - "8000:8000"
+    networks:
+      - proxy
+      - newsblur
+
+  postgres-nb:
+    container_name: postgres-nb
+    image: postgres:9
+    environment:
+      - POSTGRES_USER=newsblur
+      - POSTGRES_PASSWORD=newsblur
+    ports:
+      - "5432:5432"
+    volumes:
+      - "/docker/newsblur/postgres/entrypoint:/docker-entrypoint-initdb.d"
+      - "/docker/newsblur/postgres/data:/var/lib/postgresql/data"
+    networks:
+      - newsblur
+
+  redis-nb:
+    container_name: redis-nb
+    image: redis:3
+    ports:
+      - "6379:6379"
+    volumes:
+      - "/docker/newsblur/redis/data:/data"
+      - "/docker/newsblur/redis/redis.conf:/usr/local/etc/redis_server.conf"
+      - "/docker/newsblur/redis/redis_server.conf:/etc/redis_server.conf"
+      - "/docker/newsblur/redis/redis.var.lib:/var/lib/redis"
+    command: /usr/local/bin/redis-server /usr/local/etc/redis_server.conf
+    networks:
+      - newsblur
+
+  elasticsearch-nb:
+    container_name: elasticsearch-nb
+    image: elasticsearch:1.7
+    ports:
+      - "9200:9200"
+    volumes:
+      - "/docker/newsblur/elasticsearch:/usr/share/elasticsearch/data"
+    networks:
+      - newsblur
+
+  mongo-nb:
+    image: mongo:3.2
+    ports:
+      - "27017:27017"
+    command: mongod --smallfiles
+    volumes:
+      - "/docker/newsblur/mongo:/data/db"
+    networks:
+      - newsblur
+
+networks:
+  proxy:
+    external: true
+  newsblur:
+    driver: bridge
+    ipam:
+      driver: default
+    internal: true

docker/tt-rss/docker-compose.yml

@@ -1,90 +0,0 @@
-version: "3"
-
-services:
-  db:
-    container_name: tt-rss-db
-    image: postgres:12-alpine
-    restart: unless-stopped
-    volumes:
-      - /docker/tt-rss/db:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_USER=${POSTGRES_USER}
-    networks:
-      - tt-rss
-
-  app:
-    container_name: tt-rss-app
-    image: cthulhoo/ttrss-fpm-pgsql-static
-    restart: unless-stopped
-    environment:
-      - DB_TYPE=pgsql
-      - DB_HOST=tt-rss-db
-      - DB_NAME=${POSTGRES_USER}
-      - DB_USER=${POSTGRES_USER}
-      - DB_PASS=${POSTGRES_PASSWORD}
-      - OWNER_UID=${OWNER_UID}
-      - OWNER_GID=${OWNER_GID}
-      - SELF_URL_PATH=${SELF_URL_PATH}
-    volumes:
-      - /docker/tt-rss/app:/var/www/html
-    depends_on:
-      - db
-    networks:
-      - tt-rss
-
-  updater:
-    container_name: tt-rss-updater
-    image: cthulhoo/ttrss-fpm-pgsql-static
-    restart: unless-stopped
-    environment:
-      - DB_TYPE=pgsql
-      - DB_HOST=tt-rss-db
-      - DB_NAME=${POSTGRES_USER}
-      - DB_USER=${POSTGRES_USER}
-      - DB_PASS=${POSTGRES_PASSWORD}
-      - OWNER_UID=${OWNER_UID}
-      - OWNER_GID=${OWNER_GID}
-      - SELF_URL_PATH=${SELF_URL_PATH}
-    volumes:
-      - /docker/tt-rss/app:/var/www/html
-    depends_on:
-      - app
-    command: /updater.sh
-    networks:
-      - tt-rss
-
-  web:
-    container_name: tt-rss-web
-    image: cthulhoo/ttrss-web
-    restart: unless-stopped
-    ports:
-      - ${HTTP_PORT}:2015
-    volumes:
-      - /docker/tt-rss/app:/var/www/html:ro
-    depends_on:
-      - app
-    networks:
-      - tt-rss
-      - proxy
-    labels:
-      - "traefik.enable=true"
-
-      - "traefik.http.routers.tt-rss-redirect.entrypoints=http"
-      - "traefik.http.routers.tt-rss-redirect.rule=Host(`rss.reekynet.com`)"
-      - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
-      - "traefik.http.routers.tt-rss-redirect.middlewares=http2https"
-
-      - "traefik.http.routers.tt-rss.entrypoints=https"
-      - "traefik.http.routers.tt-rss.rule=Host(`rss.reekynet.com`)"
-      - "traefik.http.routers.tt-rss.tls=true"
-      - "traefik.http.routers.tt-rss.tls.certresolver=http"
-      - "traefik.http.routers.tt-rss.service=tt-rss"
-      - "traefik.docker.network=proxy"
-      - "traefik.http.services.tt-rss.loadbalancer.server.port=8280"
-
-networks:
-  tt-rss:
-    external: false
-  proxy:
-    external: true