Merge branch 'master' of git.reekynet.com:ReekyMarko/dotfiles

docker/freshrss/docker-compose.yml

@@ -0,0 +1,52 @@
+version: "2.1"
+services:
+  freshrss:
+    image: linuxserver/freshrss
+    container_name: freshrss
+    restart: unless-stopped
+    networks:
+      - freshrss
+      - proxy
+    ports:
+      - 8088:80
+    environment:
+      - PUID=1000
+      - PGID=985
+      - TZ=Europe/Helsinki
+    volumes:
+      - /docker/freshrss/freshrss:/config
+      - /etc/localtime:/etc/localtime:ro
+    labels:
+      - "traefik.enable=true"
+
+      - "traefik.http.routers.freshrss-redirect.entrypoints=http"
+      - "traefik.http.routers.freshrss-redirect.rule=Host(`rss.reekynet.com`)"
+      - "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
+      - "traefik.http.routers.freshrss-redirect.middlewares=http2https"
+
+      - "traefik.http.routers.freshrss.entrypoints=https"
+      - "traefik.http.routers.freshrss.rule=Host(`rss.reekynet.com`)"
+      - "traefik.http.routers.freshrss.tls=true"
+      - "traefik.http.routers.freshrss.tls.certresolver=http"
+      - "traefik.http.routers.freshrss.service=freshrss"
+      - "traefik.docker.network=proxy"
+      - "traefik.http.services.freshrss.loadbalancer.server.port=80"
+
+  mariadb-freshrss:
+    container_name: mariadb-freshrss
+    image: mariadb
+    restart: unless-stopped
+    networks:
+      - freshrss
+    environment:
+      - TZ=Europe/Helsinki
+      - MYSQL_ROOT_PASSWORD=freshrss
+    volumes:
+      - /docker/freshrss/mariadb:/var/lib/mysql
+      - /etc/localtime:/etc/localtime:ro
+
+networks:
+  freshrss:
+    external: false
+  proxy:
+    external: true

docker/tt-rss/.env

@@ -1,8 +0,0 @@
-BUILD_TAG=latest
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=password
-OWNER_UID=1000
-OWNER_GID=985
-HTTP_HOST=localhost
-SELF_URL_PATH=https://rss.reekynet.com
-HTTP_PORT=8280

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