From bce4ff6f69f4ae4d95657dda3a3c57acf244099e Mon Sep 17 00:00:00 2001
From: Christian Heusel <christian@heusel.eu>
Date: Fri, 16 Aug 2024 12:45:19 +0200
Subject: [PATCH] migrate all services from redis to valkey
We do this since the redis package is soon to be deprecated:
https://lists.archlinux.org/archives/list/arch-dev-public@lists.archlinux.org/thread/2ERGX565GSSBUMADBG7DQJYNPJD5GUXD/
Signed-off-by: Christian Heusel <christian@heusel.eu>
---
playbooks/aur-dev.archlinux.org.yml | 2 +-
playbooks/aur.archlinux.org.yml | 2 +-
roles/matrix/files/synapse.service | 4 ++--
roles/matrix/tasks/main.yml | 2 +-
roles/redis/tasks/main.yml | 5 -----
roles/rspamd/meta/main.yml | 2 +-
roles/valkey/tasks/main.yml | 5 +++++
7 files changed, 11 insertions(+), 11 deletions(-)
delete mode 100644 roles/redis/tasks/main.yml
create mode 100644 roles/valkey/tasks/main.yml
diff --git a/playbooks/aur-dev.archlinux.org.yml b/playbooks/aur-dev.archlinux.org.yml
index 2392183ac..e2c4189d9 100644
--- a/playbooks/aur-dev.archlinux.org.yml
+++ b/playbooks/aur-dev.archlinux.org.yml
@@ -10,7 +10,7 @@
- { role: nginx }
- { role: mariadb, mariadb_innodb_buffer_pool_size: '1G' }
- { role: sudo }
- - { role: redis }
+ - { role: valkey }
- { role: uwsgi }
- { role: aurweb, aurweb_domain: "{{ aurdev_fqdn }}", aurweb_environment_type: 'dev' }
- { role: fail2ban }
diff --git a/playbooks/aur.archlinux.org.yml b/playbooks/aur.archlinux.org.yml
index b5c60ea11..a44f93e54 100644
--- a/playbooks/aur.archlinux.org.yml
+++ b/playbooks/aur.archlinux.org.yml
@@ -11,7 +11,7 @@
- { role: nginx }
- { role: mariadb, mariadb_innodb_buffer_pool_size: '1G' }
- { role: sudo }
- - { role: redis }
+ - { role: valkey }
- { role: uwsgi }
- { role: borg_client, tags: ["borg"] }
- { role: postfix_null }
diff --git a/roles/matrix/files/synapse.service b/roles/matrix/files/synapse.service
index 7e0b4f714..2361d456e 100644
--- a/roles/matrix/files/synapse.service
+++ b/roles/matrix/files/synapse.service
@@ -1,8 +1,8 @@
[Unit]
Description=Synapse Matrix homeserver
-Requires=postgresql.service redis.service
+Requires=postgresql.service valkey.service
Wants=turnserver.service
-After=network.target postgresql.service redis.service turnserver.service
+After=network.target postgresql.service valkey.service turnserver.service
AssertPathExists=/etc/synapse/homeserver.yaml
[Service]
diff --git a/roles/matrix/tasks/main.yml b/roles/matrix/tasks/main.yml
index b104b1443..53905f315 100644
--- a/roles/matrix/tasks/main.yml
+++ b/roles/matrix/tasks/main.yml
@@ -28,10 +28,10 @@
- pkgconf
- postgresql-libs
- python
- - redis
- rust
- tcl
- tk
+ - valkey
- yarn
- zlib
diff --git a/roles/redis/tasks/main.yml b/roles/redis/tasks/main.yml
deleted file mode 100644
index 12203cd59..000000000
--- a/roles/redis/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-- name: Install redis
- pacman: name=redis state=present
-
-- name: Start and enable redis
- service: name=redis enabled=yes state=started
diff --git a/roles/rspamd/meta/main.yml b/roles/rspamd/meta/main.yml
index 422d71afa..b9a6cd67a 100644
--- a/roles/rspamd/meta/main.yml
+++ b/roles/rspamd/meta/main.yml
@@ -3,4 +3,4 @@ galaxy_info:
standalone: false
dependencies:
- - role: redis
+ - role: valkey
diff --git a/roles/valkey/tasks/main.yml b/roles/valkey/tasks/main.yml
new file mode 100644
index 000000000..31e823cc8
--- /dev/null
+++ b/roles/valkey/tasks/main.yml
@@ -0,0 +1,5 @@
+- name: Install valkey
+ pacman: name=valkey state=present
+
+- name: Start and enable valkey
+ service: name=valkey enabled=yes state=started
--
GitLab