From 715fdbc2ba5c4b7fcf45842cc3edd8a93f9b2111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Thu, 25 Jan 2024 17:40:42 +0300 Subject: [PATCH] Node-attribute ALL THE THINGS --- site-cookbooks/liquor_cabinet/attributes/default.rb | 6 +++++- site-cookbooks/liquor_cabinet/recipes/default.rb | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/site-cookbooks/liquor_cabinet/attributes/default.rb b/site-cookbooks/liquor_cabinet/attributes/default.rb index 6e88013..467aebb 100644 --- a/site-cookbooks/liquor_cabinet/attributes/default.rb +++ b/site-cookbooks/liquor_cabinet/attributes/default.rb @@ -1,6 +1,9 @@ -node.default['liquor-cabinet']['ruby']['version'] = "3.1.4" +node.default['liquor-cabinet']['app_name'] = "liquor-cabinet" +node.default['liquor-cabinet']['user'] = "deploy" +node.default['liquor-cabinet']['group'] = "deploy" node.default['liquor-cabinet']['repo'] = 'https://gitea.kosmos.org/5apps/liquor-cabinet.git' node.default['liquor-cabinet']['revision'] = 'master' +node.default['liquor-cabinet']['deploy_path'] = "/opt/#{node['liquor-cabinet']['app_name']}" node.default['liquor-cabinet']['redis_server_role'] = 'redis_server' node.default['liquor-cabinet']['redis_port'] = 6379 node.default['liquor-cabinet']['redis_db'] = 1 @@ -9,6 +12,7 @@ node.default['liquor-cabinet']['s3_region'] = nil node.default['liquor-cabinet']['s3_bucket'] = nil node.default['liquor-cabinet']['ufw_source_allowed'] = nil node.default['liquor-cabinet']['maintenance_mode_enabled'] = false +node.default['liquor-cabinet']['ruby']['version'] = "3.1.4" node.default['liquor-cabinet']['rainbows'] = { 'port' => 3000, 'preload_app' => true, diff --git a/site-cookbooks/liquor_cabinet/recipes/default.rb b/site-cookbooks/liquor_cabinet/recipes/default.rb index ebf6b0e..39687cd 100644 --- a/site-cookbooks/liquor_cabinet/recipes/default.rb +++ b/site-cookbooks/liquor_cabinet/recipes/default.rb @@ -3,10 +3,10 @@ # Recipe:: default # -app_name = "liquor-cabinet" -deploy_user = "deploy" -deploy_group = "deploy" -deploy_path = "/opt/#{app_name}" +app_name = node['liquor-cabinet']['app_name'] +deploy_user = node[app_name]['user'] +deploy_group = node[app_name]['group'] +deploy_path = node[app_name]['deploy_path'] credentials = Chef::EncryptedDataBagItem.load('credentials', app_name) ruby_version = node[app_name]['ruby']['version']