Drops tt-rss entirely
This commit is contained in:
parent
aa7c9047e9
commit
5eecce56a3
|
|
@ -22,7 +22,7 @@ The canonical URL for this repo is https://git.captnemo.in/nemo/nebula/. A mirro
|
|||
4. media: Media related containers (Jackett, Lidarr, Radarr, Sonarr)
|
||||
5. Monitoring: Monitoring related resources (Cadvisor, Grafana, NodeExporter, Prometheus, Transmission-Exporter)
|
||||
6. Gitea: Just git.captnemo.in
|
||||
7. tt-rss: Tiny-Tiny RSS Web reader
|
||||
7. miniflux: RSS Web reader
|
||||
8. Radicale: CardDav/CalDav webserver
|
||||
|
||||
Self-learning project for terraform/docker.
|
||||
|
|
@ -59,7 +59,6 @@ Currently running the following (all links are to the `store.docker.com` links f
|
|||
| linuxserver/resilio-sync | latest | sync |
|
||||
| linuxserver/sonarr | latest | media |
|
||||
| linuxserver/transmission | latest | media |
|
||||
| linuxserver/tt-rss | latest | tools |
|
||||
| linuxserver/ubooquity | latest | media |
|
||||
| miniflux/miniflux | 2.0.9 | tools |
|
||||
| monicahq/monicahq | latest | services |
|
||||
|
|
|
|||
|
|
@ -23,10 +23,6 @@ checkNewVersion = false
|
|||
[[entryPoints.https.tls.certificates]]
|
||||
certFile = "/etc/traefik/rss.captnemo.in.crt"
|
||||
keyFile = "/etc/traefik/rss.captnemo.in.key"
|
||||
# This contains 2 domains: {emby|airsonic}.bb8.fun
|
||||
[[entryPoints.https.tls.certificates]]
|
||||
certFile = "/etc/traefik/emby.in.bb8.fun.crt"
|
||||
keyFile = "/etc/traefik/emby.in.bb8.fun.key"
|
||||
|
||||
[docker]
|
||||
# Make sure you mount this as readonly
|
||||
|
|
|
|||
|
|
@ -67,16 +67,6 @@ resource "docker_container" "traefik" {
|
|||
file = "/etc/traefik/rss.captnemo.in.key"
|
||||
}
|
||||
|
||||
upload {
|
||||
content = "${file("/home/nemo/projects/personal/certs/emby.in.bb8.fun/privkey.pem")}"
|
||||
file = "/etc/traefik/emby.in.bb8.fun.key"
|
||||
}
|
||||
|
||||
upload {
|
||||
content = "${file("/home/nemo/projects/personal/certs/emby.in.bb8.fun/fullchain.pem")}"
|
||||
file = "/etc/traefik/emby.in.bb8.fun.crt"
|
||||
}
|
||||
|
||||
volumes {
|
||||
host_path = "/var/run/docker.sock"
|
||||
container_path = "/var/run/docker.sock"
|
||||
|
|
|
|||
12
main.tf
12
main.tf
|
|
@ -61,18 +61,10 @@ module "radicale" {
|
|||
traefik-network-id = "${module.docker.traefik-network-id}"
|
||||
}
|
||||
|
||||
module "tt-rss" {
|
||||
source = "tt-rss"
|
||||
domain = "rss.captnemo.in"
|
||||
mysql_password = "${var.mysql-ttrss-password}"
|
||||
traefik-labels = "${var.traefik-common-labels}"
|
||||
traefik-network-id = "${module.docker.traefik-network-id}"
|
||||
postgres-network-id = "${module.db.postgres-network-id}"
|
||||
}
|
||||
|
||||
module "miniflux" {
|
||||
source = "miniflux"
|
||||
domain = "miniflux.bb8.fun"
|
||||
domain = "rss.captnemo.in"
|
||||
release = "2.0.10"
|
||||
db-password = "${var.miniflux-db-password}"
|
||||
traefik-labels = "${var.traefik-common-labels}"
|
||||
traefik-network-id = "${module.docker.traefik-network-id}"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
data "docker_registry_image" "miniflux" {
|
||||
name = "miniflux/miniflux:2.0.9"
|
||||
name = "miniflux/miniflux:${var.release}"
|
||||
}
|
||||
|
||||
resource "docker_image" "miniflux" {
|
||||
|
|
|
|||
|
|
@ -9,4 +9,9 @@ variable "traefik-labels" {
|
|||
type = "map"
|
||||
}
|
||||
|
||||
variable "release" {
|
||||
description = "miniflux version"
|
||||
type = "string"
|
||||
}
|
||||
|
||||
variable "traefik-network-id" {}
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
resource "postgresql_database" "ttrss" {
|
||||
name = "ttrss"
|
||||
owner = "ttrss"
|
||||
}
|
||||
|
||||
resource "postgresql_role" "ttrss" {
|
||||
name = "ttrss"
|
||||
login = true
|
||||
password = "${var.mysql_password}"
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param QUERY_STRING $query_string;
|
||||
fastcgi_param REQUEST_METHOD $request_method;
|
||||
fastcgi_param CONTENT_TYPE $content_type;
|
||||
fastcgi_param CONTENT_LENGTH $content_length;
|
||||
|
||||
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
|
||||
fastcgi_param REQUEST_URI $request_uri;
|
||||
fastcgi_param DOCUMENT_URI $document_uri;
|
||||
fastcgi_param DOCUMENT_ROOT $document_root;
|
||||
fastcgi_param SERVER_PROTOCOL $server_protocol;
|
||||
fastcgi_param REQUEST_SCHEME $scheme;
|
||||
fastcgi_param HTTPS $https if_not_empty;
|
||||
|
||||
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
|
||||
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
|
||||
|
||||
fastcgi_param REMOTE_ADDR $remote_addr;
|
||||
fastcgi_param REMOTE_PORT $remote_port;
|
||||
fastcgi_param SERVER_ADDR $server_addr;
|
||||
fastcgi_param SERVER_PORT $server_port;
|
||||
fastcgi_param SERVER_NAME $server_name;
|
||||
|
||||
# PHP only, required if PHP was built with --enable-force-cgi-redirect
|
||||
fastcgi_param REDIRECT_STATUS 200;
|
||||
|
||||
fastcgi_read_timeout 300s
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
data "docker_registry_image" "tt-rss" {
|
||||
name = "linuxserver/tt-rss:latest"
|
||||
}
|
||||
|
||||
resource "docker_image" "tt-rss" {
|
||||
name = "${data.docker_registry_image.tt-rss.name}"
|
||||
pull_triggers = ["${data.docker_registry_image.tt-rss.sha256_digest}"]
|
||||
}
|
||||
|
||||
resource "docker_container" "tt-rss" {
|
||||
name = "tt-rss"
|
||||
image = "${docker_image.tt-rss.latest}"
|
||||
|
||||
labels = "${merge(
|
||||
var.traefik-labels, map(
|
||||
"traefik.port", 80,
|
||||
"traefik.frontend.rule","Host:${var.domain}"
|
||||
))}"
|
||||
|
||||
volumes {
|
||||
host_path = "/mnt/xwing/config/tt-rss"
|
||||
container_path = "/config"
|
||||
}
|
||||
|
||||
upload {
|
||||
content = "${file("${path.module}/fastcgi.conf")}"
|
||||
file = "/etc/nginx/fastcgi.conf"
|
||||
}
|
||||
|
||||
networks = ["${var.traefik-network-id}", "${var.postgres-network-id}"]
|
||||
|
||||
env = [
|
||||
"TZ=Asia/Kolkata",
|
||||
]
|
||||
|
||||
restart = "unless-stopped"
|
||||
destroy_grace_seconds = 10
|
||||
must_run = true
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
variable "domain" {
|
||||
type = "string"
|
||||
}
|
||||
|
||||
variable "mysql_password" {}
|
||||
variable "postgres-network-id" {}
|
||||
|
||||
variable "traefik-labels" {
|
||||
type = "map"
|
||||
}
|
||||
|
||||
variable "traefik-network-id" {}
|
||||
|
|
@ -15,7 +15,6 @@ variable "postgres-root-password" {
|
|||
type = "string"
|
||||
}
|
||||
|
||||
variable "mysql-ttrss-password" {}
|
||||
variable "gitea-mysql-password" {}
|
||||
|
||||
variable "wiki_session_secret" {
|
||||
|
|
|
|||
Loading…
Reference in New Issue