kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 29 Pull Requests 3 Projects 2 Activity

Merge branch 'master' into feature/147-gitea_cookbook

Browse Source
This commit is contained in:
Greg Karékinian 2020-05-28 15:44:44 +02:00
commit baaae695af
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nodes/andromeda.kosmos.org.json
View File

@ -108,7 +108,8 @@
"kosmos-base::letsencrypt", "kosmos-base::letsencrypt",
"git::default", "git::default",
"git::package", "git::package",
"build-essential::default" "build-essential::default",
"poise-git::default"
], ],
"platform": "ubuntu", "platform": "ubuntu",
"platform_version": "18.04", "platform_version": "18.04",

2
site-cookbooks/kosmos-dirsrv/resources/instance.rb
View File

@ -157,7 +157,7 @@ done
end end
nginx_certbot_site new_resource.hostname do nginx_certbot_site new_resource.hostname do
notifies :run, "letsencrypt cert for #{domain}", :delayed notifies :run, "execute[letsencrypt cert for #{domain}]", :delayed
end end
# Generate a Let's Encrypt cert (only if the nginx vhost exists and no cert # Generate a Let's Encrypt cert (only if the nginx vhost exists and no cert

3
site-cookbooks/kosmos-hubot/recipes/hal8000_xmpp.rb
View File

@ -120,7 +120,8 @@ application app_path do
"KREDITS_SESSION_SECRET" => data_bag['kredits_session_secret'], "KREDITS_SESSION_SECRET" => data_bag['kredits_session_secret'],
"KREDITS_GITHUB_KEY" => data_bag['kredits_github_key'], "KREDITS_GITHUB_KEY" => data_bag['kredits_github_key'],
"KREDITS_GITHUB_SECRET" => data_bag['kredits_github_secret'], "KREDITS_GITHUB_SECRET" => data_bag['kredits_github_secret'],
"KREDITS_ZOOM_JWT" => data_bag['kredits_zoom_jwt'] "KREDITS_ZOOM_JWT" => data_bag['kredits_zoom_jwt'],
"KREDITS_ZOOM_MEETING_WHITELIST" => "414901303"
} }
) )
notifies :run, "execute[systemctl daemon-reload]", :delayed notifies :run, "execute[systemctl daemon-reload]", :delayed

4
site-cookbooks/kosmos-mastodon/recipes/default.rb
View File

@ -79,10 +79,10 @@ package %w(imagemagick ffmpeg libxml2-dev libxslt1-dev file git curl pkg-config
libprotobuf-dev protobuf-compiler libidn11 libidn11-dev libjemalloc1) libprotobuf-dev protobuf-compiler libidn11 libidn11-dev libjemalloc1)
npm_package "yarn" do npm_package "yarn" do
version "1.17.3" version "1.22.4"
end end
ruby_version = "2.6.5" ruby_version = "2.6.6"
execute "systemctl daemon-reload" do execute "systemctl daemon-reload" do
command "systemctl daemon-reload" command "systemctl daemon-reload"