infra: remove rssrss

2 files changed, 6 insertions, 35 deletions

diff --git a/rss.jinwei.me/config/roles/rss/tasks/main.yaml b/rss.jinwei.me/config/roles/rss/tasks/main.yaml
index d70729a..f62c897 100644
--- a/rss.jinwei.me/config/roles/rss/tasks/main.yaml
+++ b/rss.jinwei.me/config/roles/rss/tasks/main.yaml
@@ -4,25 +4,25 @@
       - python3-pymysql
     update_cache: true
 
-- name: create ttrss database if not exists
+- name: create rss database if not exists
   community.mysql.mysql_db:
     login_host: "{{ lookup('aws_ssm', '/jinwei-me/mysql/host') }}"
     login_port: "{{ lookup('aws_ssm', '/jinwei-me/mysql/port') }}"
     login_user: "{{ lookup('aws_ssm', '/jinwei-me/mysql/username') }}"
     login_password: "{{ lookup('aws_ssm', '/jinwei-me/mysql/password') }}"
-    name: "{{ lookup('aws_ssm', '/jinwei-me/mysql/ttrss_db_name') }}"
+    name: "{{ lookup('aws_ssm', '/jinwei-me/mysql/rss_db_name') }}"
     state: present
 
-- name: create ttrss database user
+- name: create rss database user
   community.mysql.mysql_user:
     login_host: "{{ lookup('aws_ssm', '/jinwei-me/mysql/host') }}"
     login_port: "{{ lookup('aws_ssm', '/jinwei-me/mysql/port') }}"
     login_user: "{{ lookup('aws_ssm', '/jinwei-me/mysql/username') }}"
     login_password: "{{ lookup('aws_ssm', '/jinwei-me/mysql/password') }}"
-    name: "{{ lookup('aws_ssm', '/jinwei-me/mysql/ttrss_db_user') }}"
+    name: "{{ lookup('aws_ssm', '/jinwei-me/mysql/rss_db_user') }}"
     host: "%"
-    password: "{{ lookup('aws_ssm', '/jinwei-me/mysql/ttrss_db_password') }}"
-    priv: "{{ lookup('aws_ssm', '/jinwei-me/mysql/ttrss_db_name') }}.*:ALL"
+    password: "{{ lookup('aws_ssm', '/jinwei-me/mysql/rss_user_password') }}"
+    priv: "{{ lookup('aws_ssm', '/jinwei-me/mysql/rss_db_name') }}.*:ALL"
     state: present
 
 - name: create rss_home
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
deleted file mode 100644
index b79dbaa..0000000
--- a/rss.jinwei.me/config/roles/rss/templates/docker-compose.yaml.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-version: "3"
-services:
-  freshrss:
-    image: freshrss/freshrss:edge
-    container_name: freshrss
-    restart: always
-    logging:
-      options:
-        max-size: 10m
-    volumes:
-      # Recommended volume for FreshRSS persistent data such as configuration and SQLite databases
-      - {{ rss_home }}/data:/var/www/FreshRSS/data
-      # Optional volume for storing third-party extensions
-      - {{ rss_home }}/extensions:/var/www/FreshRSS/extensions
-    ports:
-      # If you want to open a port 8080 on the local machine:
-      - 30082:80
-    environment:
-      # A timezone http://php.net/timezones (default is UTC)
-      TZ: America/Vancouver
-
-  rssbot:
-    build:
-      context: .
-      dockerfile: ./Dockerfile.rssbot
-    container_name: ttrss_rssbot
-    restart: always
-    environment:
-      - TOKEN={{ lookup('aws_ssm', '/jinwei-me/tgbot/token') }}