Move strfry extras into their own directory

This commit is contained in:
Râu Cao 2024-07-03 09:22:50 +02:00
parent 522c213b09
commit 8b8e8f3438
Signed by: raucao
GPG Key ID: 37036C356E56CC51
3 changed files with 16 additions and 7 deletions

View File

@ -106,7 +106,7 @@
"strfry": { "strfry": {
"domain": "nostr.kosmos.org", "domain": "nostr.kosmos.org",
"real_ip_header": "x-real-ip", "real_ip_header": "x-real-ip",
"policy_path": "/opt/strfry-policy.ts", "policy_path": "/opt/strfry/strfry-policy.ts",
"whitelist_pubkeys": [ "whitelist_pubkeys": [
"b3e1b7c1660b7db0ecb93ec55c09e67961171a5c4e9e2602f1b47477ea61c50a" "b3e1b7c1660b7db0ecb93ec55c09e67961171a5c4e9e2602f1b47477ea61c50a"
], ],

View File

@ -1 +1,2 @@
node.default["strfry"]["ldap_search_dn"] = "ou=kosmos.org,cn=users,dc=kosmos,dc=org" node.default["strfry"]["ldap_search_dn"] = "ou=kosmos.org,cn=users,dc=kosmos,dc=org"
node.default["strfry"]["extras_dir"] = "/opt/strfry"

View File

@ -11,6 +11,14 @@ include_recipe "deno"
ldap_credentials = Chef::EncryptedDataBagItem.load('credentials', 'dirsrv') ldap_credentials = Chef::EncryptedDataBagItem.load('credentials', 'dirsrv')
extras_dir = node["strfry"]["extras_dir"]
directory extras_dir do
owner node["strfry"]["user"]
group node["strfry"]["group"]
mode "0755"
end
env = { env = {
ldap_url: 'ldap://ldap.kosmos.local:389', # requires "ldap_client" role ldap_url: 'ldap://ldap.kosmos.local:389', # requires "ldap_client" role
ldap_bind_dn: ldap_credentials["service_dn"], ldap_bind_dn: ldap_credentials["service_dn"],
@ -19,7 +27,7 @@ env = {
whitelist_pubkeys: node["strfry"]["whitelist_pubkeys"].join(",") whitelist_pubkeys: node["strfry"]["whitelist_pubkeys"].join(",")
} }
template "/opt/.env" do template "#{extras_dir}/.env" do
source 'env.erb' source 'env.erb'
owner node["strfry"]["user"] owner node["strfry"]["user"]
group node["strfry"]["group"] group node["strfry"]["group"]
@ -35,7 +43,7 @@ end
base_url = "https://gitea.kosmos.org/kosmos/akkounts/raw/branch/live/extras/strfry" base_url = "https://gitea.kosmos.org/kosmos/akkounts/raw/branch/live/extras/strfry"
remote_file "/opt/deno.json" do remote_file "#{extras_dir}/deno.json" do
source "#{base_url}/deno.json" source "#{base_url}/deno.json"
owner node["strfry"]["user"] owner node["strfry"]["user"]
group node["strfry"]["group"] group node["strfry"]["group"]
@ -43,7 +51,7 @@ remote_file "/opt/deno.json" do
notifies :restart, "service[strfry]", :delayed notifies :restart, "service[strfry]", :delayed
end end
remote_file "/opt/deno.lock" do remote_file "#{extras_dir}/deno.lock" do
source "#{base_url}/deno.lock" source "#{base_url}/deno.lock"
owner node["strfry"]["user"] owner node["strfry"]["user"]
group node["strfry"]["group"] group node["strfry"]["group"]
@ -51,7 +59,7 @@ remote_file "/opt/deno.lock" do
notifies :restart, "service[strfry]", :delayed notifies :restart, "service[strfry]", :delayed
end end
remote_file "/opt/strfry-policy.ts" do remote_file "#{extras_dir}/strfry-policy.ts" do
source "#{base_url}/strfry-policy.ts" source "#{base_url}/strfry-policy.ts"
owner node["strfry"]["user"] owner node["strfry"]["user"]
group node["strfry"]["group"] group node["strfry"]["group"]
@ -59,7 +67,7 @@ remote_file "/opt/strfry-policy.ts" do
notifies :restart, "service[strfry]", :delayed notifies :restart, "service[strfry]", :delayed
end end
remote_file "/opt/ldap-policy.ts" do remote_file "#{extras_dir}/ldap-policy.ts" do
source "#{base_url}/ldap-policy.ts" source "#{base_url}/ldap-policy.ts"
owner node["strfry"]["user"] owner node["strfry"]["user"]
group node["strfry"]["group"] group node["strfry"]["group"]
@ -67,7 +75,7 @@ remote_file "/opt/ldap-policy.ts" do
notifies :restart, "service[strfry]", :delayed notifies :restart, "service[strfry]", :delayed
end end
remote_file "/opt/strfry-sync.ts" do remote_file "#{extras_dir}/strfry-sync.ts" do
source "#{base_url}/strfry-sync.ts" source "#{base_url}/strfry-sync.ts"
owner node["strfry"]["user"] owner node["strfry"]["user"]
group node["strfry"]["group"] group node["strfry"]["group"]