diff options
-rw-r--r-- | jinwei.me/infra/cloudflare.tf | 2 | ||||
-rw-r--r-- | rss.jinwei.me/config/roles/rss/templates/docker-compose.yaml.j2 | 2 | ||||
-rw-r--r-- | 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" { | |||
60 | ingress_rule { | 60 | ingress_rule { |
61 | hostname = "feed.jinwei.me" | 61 | hostname = "feed.jinwei.me" |
62 | path = "/" | 62 | path = "/" |
63 | service = "http://ttrss:80" | 63 | service = "http://127.0.0.1:30080" |
64 | } | 64 | } |
65 | ingress_rule { | 65 | ingress_rule { |
66 | service = "http_status:404" | 66 | 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: | |||
12 | - DB_PASS={{ lookup('aws_ssm', '/jinwei-me/mysql/ttrss_db_password') }} | 12 | - DB_PASS={{ lookup('aws_ssm', '/jinwei-me/mysql/ttrss_db_password') }} |
13 | - PUID=1000 | 13 | - PUID=1000 |
14 | - PGID=1000 | 14 | - PGID=1000 |
15 | ports: | ||
16 | - 30080:80 | ||
15 | volumes: | 17 | volumes: |
16 | - {{ rss_home }}/feed-icons:/var/www/feed-icons/ | 18 | - {{ rss_home }}/feed-icons:/var/www/feed-icons/ |
17 | stdin_open: true | 19 | 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" { | |||
21 | } | 21 | } |
22 | 22 | ||
23 | variable "ttrss_site_url" { | 23 | variable "ttrss_site_url" { |
24 | default = "feed.jinwei.me" | 24 | default = "https://feed.jinwei.me" |
25 | } | 25 | } |
26 | 26 | ||
27 | variable "rss_tgbot_token" { | 27 | variable "rss_tgbot_token" { |