From 98543f3e7d0b92a2e3d701b7f62c184c4776e254 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Fri, 26 Jan 2024 09:01:55 +0300 Subject: [PATCH] Configure RS integration for akkounts --- environments/production.json | 2 ++ site-cookbooks/kosmos-akkounts/recipes/default.rb | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/environments/production.json b/environments/production.json index 0b458e8..e80e3b7 100644 --- a/environments/production.json +++ b/environments/production.json @@ -82,6 +82,8 @@ }, "liquor-cabinet": { "ufw_source_allowed": "10.1.1.0/24", + "redis_port": 6379, + "redis_db": 1, "s3_endpoint": "http://localhost:3900", "s3_region": "garage", "s3_bucket": "rs-kosmos", diff --git a/site-cookbooks/kosmos-akkounts/recipes/default.rb b/site-cookbooks/kosmos-akkounts/recipes/default.rb index af41c51..558dc5b 100644 --- a/site-cookbooks/kosmos-akkounts/recipes/default.rb +++ b/site-cookbooks/kosmos-akkounts/recipes/default.rb @@ -155,6 +155,19 @@ env[:mastodon_public_url] = "https://#{node['kosmos-mastodon']['domain']}" env[:mediawiki_public_url] = node['mediawiki']['url'] +# +# remoteStorage / Liquor Cabinet +# + +env[:rs_storage_url] = "https://#{node['liquor-cabinet']['domain']}" + +rs_redis_host = search(:node, "role:redis_server").first["knife_zero"]["host"] rescue nil +rs_redis_port = node['liquor-cabinet']['redis_port'] +rs_redis_db = node['liquor-cabinet']['redis_db'] +if rs_redis_host + env[:rs_redis_url] = "redis://#{rs_redis_host}:#{rs_redis_port}/#{rs_redis_db}" +end + # # Akkounts Deployment #