From c7dad7de56fa1ea50257220d2b62ad4520dcdeab Mon Sep 17 00:00:00 2001 From: clarkzjw Date: Mon, 12 Dec 2022 11:23:42 -0800 Subject: infra: update ttrss ingress rule to use port mapping temporarily --- jinwei.me/infra/cloudflare.tf | 2 +- rss.jinwei.me/config/roles/rss/templates/docker-compose.yaml.j2 | 2 ++ rss.jinwei.me/infra/variables.tf | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jinwei.me/infra/cloudflare.tf b/jinwei.me/infra/cloudflare.tf index ce1add3..c8018d6 100644 --- a/jinwei.me/infra/cloudflare.tf +++ b/jinwei.me/infra/cloudflare.tf @@ -60,7 +60,7 @@ resource "cloudflare_tunnel_config" "tunnel_route" { ingress_rule { hostname = "feed.jinwei.me" path = "/" - service = "http://ttrss:80" + service = "http://127.0.0.1:30080" } ingress_rule { service = "http_status:404" diff --git a/rss.jinwei.me/config/roles/rss/templates/docker-compose.yaml.j2 b/rss.jinwei.me/config/roles/rss/templates/docker-compose.yaml.j2 index 99da1a9..7a2411a 100644 --- a/rss.jinwei.me/config/roles/rss/templates/docker-compose.yaml.j2 +++ b/rss.jinwei.me/config/roles/rss/templates/docker-compose.yaml.j2 @@ -12,6 +12,8 @@ services: - DB_PASS={{ lookup('aws_ssm', '/jinwei-me/mysql/ttrss_db_password') }} - PUID=1000 - PGID=1000 + ports: + - 30080:80 volumes: - {{ rss_home }}/feed-icons:/var/www/feed-icons/ stdin_open: true diff --git a/rss.jinwei.me/infra/variables.tf b/rss.jinwei.me/infra/variables.tf index 64e6912..01b051b 100644 --- a/rss.jinwei.me/infra/variables.tf +++ b/rss.jinwei.me/infra/variables.tf @@ -21,7 +21,7 @@ variable "ttrss_db_user" { } variable "ttrss_site_url" { - default = "feed.jinwei.me" + default = "https://feed.jinwei.me" } variable "rss_tgbot_token" { -- cgit v1.2.3