From d2cd65ba2fd8baf73e03fad65b4d6a9e80190c19 Mon Sep 17 00:00:00 2001
From: VC <veretcle+framagit@mateu.be>
Date: Fri, 9 Aug 2024 17:52:07 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8:=20get=20from=20ttrss=20to=20freshrss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/vhosts/rss.libertus.eu.conf.j2  | 12 +++++++-----
 roles/webapps/files/ttrss_backend.service     | 11 -----------
 roles/webapps/tasks/freshrss.yml              | 19 +++++++++++++++++++
 roles/webapps/tasks/main.yml                  |  4 ++--
 roles/webapps/tasks/ttrss.yml                 | 18 ------------------
 roles/webapps/templates/freshrss.service.j2   |  8 ++++++++
 roles/webapps/templates/freshrss.timer.j2     |  9 +++++++++
 7 files changed, 45 insertions(+), 36 deletions(-)
 delete mode 100644 roles/webapps/files/ttrss_backend.service
 create mode 100644 roles/webapps/tasks/freshrss.yml
 delete mode 100644 roles/webapps/tasks/ttrss.yml
 create mode 100644 roles/webapps/templates/freshrss.service.j2
 create mode 100644 roles/webapps/templates/freshrss.timer.j2

diff --git a/roles/nginx/templates/vhosts/rss.libertus.eu.conf.j2 b/roles/nginx/templates/vhosts/rss.libertus.eu.conf.j2
index edf474f..43739ed 100644
--- a/roles/nginx/templates/vhosts/rss.libertus.eu.conf.j2
+++ b/roles/nginx/templates/vhosts/rss.libertus.eu.conf.j2
@@ -1,17 +1,19 @@
 server {
 {% include './templates/header.conf.j2' %}
-	root /srv/http/rss.libertus.eu/;
+	root /srv/http/rss.libertus.eu/p;
 	index index.html index.htm index.php;
 	
 	location ~ \.(js|css|png|jpg|jpeg|gif|svg|svgz)$ {
 		expires 2w;
 		log_not_found off;
 	}
-	
-	location ~ /\.git {
-		deny all;
+
+	location ~ ^/(api/greader).php(/.*)+ {
+		fastcgi_split_path_info ^(.+\.php)(/.*)$;
+		fastcgi_pass unix:/var/run/php/php8.2-fpm.sock;
+		include fastcgi_params;
 	}
-	
+
 	location ~ \.php$ {
 		try_files $uri $uri/ =404;
 		fastcgi_pass unix:/var/run/php/php{{ php_version }}-fpm.sock;
diff --git a/roles/webapps/files/ttrss_backend.service b/roles/webapps/files/ttrss_backend.service
deleted file mode 100644
index 2d76723..0000000
--- a/roles/webapps/files/ttrss_backend.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=ttrss_backend
-After=network.target mysql.service postgresql.service
-
-[Service]
-User=www-data
-ExecStart=/srv/http/rss.libertus.eu/update_daemon2.php
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/roles/webapps/tasks/freshrss.yml b/roles/webapps/tasks/freshrss.yml
new file mode 100644
index 0000000..9414554
--- /dev/null
+++ b/roles/webapps/tasks/freshrss.yml
@@ -0,0 +1,19 @@
+---
+
+- name: Install FreshRSS timer
+  ansible.builtin.template:
+    src: freshrss.timer.j2
+    dest: /etc/systemd/system/freshrss.timer
+    mode: "0o644"
+
+- name: Install FreshRSS service
+  ansible.builtin.template:
+    src: freshrss.service.j2
+    dest: /etc/systemd/system/freshrss.service
+    mode: "0o644"
+
+- name: Enable FreshRSS timer
+  ansible.builtin.service:
+    name: freshrss
+    enabled: true
+    state: started
diff --git a/roles/webapps/tasks/main.yml b/roles/webapps/tasks/main.yml
index 4aed147..e4fcec6 100644
--- a/roles/webapps/tasks/main.yml
+++ b/roles/webapps/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
-- name: Include ttrss for web1
-  ansible.builtin.include_tasks: ttrss.yml
+- name: Include freshrss for web1
+  ansible.builtin.include_tasks: freshrss.yml
   when: inventory_hostname == 'web1.dmz.mateu.be'
 - name: Include matomo for web2
   ansible.builtin.include_tasks: matomo.yml
diff --git a/roles/webapps/tasks/ttrss.yml b/roles/webapps/tasks/ttrss.yml
deleted file mode 100644
index 218aaf4..0000000
--- a/roles/webapps/tasks/ttrss.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-
-- name: Install git
-  ansible.builtin.package:
-    name: git
-    state: present
-
-- name: Put systemd file for backend
-  ansible.builtin.copy:
-    src: files/ttrss_backend.service
-    dest: /etc/systemd/system/ttrss_backend.service
-    mode: "0o644"
-
-- name: Enable and start service ttrss_backend
-  ansible.builtin.service:
-    name: ttrss_backend
-    enabled: true
-    state: started
diff --git a/roles/webapps/templates/freshrss.service.j2 b/roles/webapps/templates/freshrss.service.j2
new file mode 100644
index 0000000..6815aa4
--- /dev/null
+++ b/roles/webapps/templates/freshrss.service.j2
@@ -0,0 +1,8 @@
+[Unit]
+Description=FreshRSS get new content
+Wants=freshrss.timer
+
+[Service]
+User=www-data
+Type=simple
+ExecStart=/usr/bin/php /srv/http/rss.libertus.eu/app/actualize_script.php
diff --git a/roles/webapps/templates/freshrss.timer.j2 b/roles/webapps/templates/freshrss.timer.j2
new file mode 100644
index 0000000..a95a9cd
--- /dev/null
+++ b/roles/webapps/templates/freshrss.timer.j2
@@ -0,0 +1,9 @@
+[Unit]
+Description=FreshRSS get new content
+
+[Timer]
+OnBootSec=30s
+OnCalendar=*:0/20
+
+[Install]
+WantedBy=timers.target