infra: use host network and port mapping

config: change ttrss to freshrss

2 files changed, 5 insertions, 2 deletions

diff --git a/jinwei.me/config/roles/wordpress/templates/docker-compose.yaml.j2 b/jinwei.me/config/roles/wordpress/templates/docker-compose.yaml.j2
index be85fb4..447b80b 100644
--- a/jinwei.me/config/roles/wordpress/templates/docker-compose.yaml.j2
+++ b/jinwei.me/config/roles/wordpress/templates/docker-compose.yaml.j2
@@ -3,6 +3,7 @@ services:
     cloudflared:
         image: cloudflare/cloudflared
         container_name: cloudflare-tunnel
+        network_mode: host
         restart: always
         command: tunnel run
         environment:
@@ -12,6 +13,8 @@ services:
         volumes:
         - "{{ wordpress_home }}/wp-content:/var/www/html/wp-content"
         restart: always
+        ports:
+        - 30081:80
         environment:
         - WORDPRESS_DB_HOST={{ lookup('aws_ssm', '/jinwei-me/mysql/host') }}:{{ lookup('aws_ssm', '/jinwei-me/mysql/port') }}
         - WORDPRESS_DB_USER={{ lookup('aws_ssm', '/jinwei-me/mysql/username') }}
diff --git a/jinwei.me/infra/cloudflare.tf b/jinwei.me/infra/cloudflare.tf
index c8018d6..1b157d8 100644
--- a/jinwei.me/infra/cloudflare.tf
+++ b/jinwei.me/infra/cloudflare.tf
@@ -55,12 +55,12 @@ resource "cloudflare_tunnel_config" "tunnel_route" {
     ingress_rule {
       hostname = "jinwei.me"
       path     = "/"
-      service  = "http://wordpress:80"
+      service  = "http://127.0.0.1:30081"
     }
     ingress_rule {
       hostname = "feed.jinwei.me"
       path     = "/"
-      service  = "http://127.0.0.1:30080"
+      service  = "http://127.0.0.1:30082"
     }
     ingress_rule {
       service = "http_status:404"