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

Merge branch 'master' into feature/222-discourse

Browse Source
This commit is contained in:
Greg 2020-10-23 10:11:05 +00:00
commit 42a70962e8
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,7 @@ done
# 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
# has been generated before. The renew cron will take care of renewing # has been generated before. The renew cron will take care of renewing
execute "letsencrypt cert for #{new_resource.hostname}" do execute "letsencrypt cert for #{new_resource.hostname}" do
command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@kosmos.org --webroot-path #{root_directory} --deploy-hook /etc/letsencrypt/renewal-hooks/deploy/dirsrv -d #{new_resource.hostname} -n" command "/usr/bin/certbot certonly --webroot --agree-tos --email ops@kosmos.org --webroot-path /var/www/#{new_resource.hostname} --deploy-hook /etc/letsencrypt/renewal-hooks/deploy/dirsrv -d #{new_resource.hostname} -n"
only_if do only_if do
::File.exist?("#{node['nginx']['dir']}/sites-enabled/#{new_resource.hostname}_certbot") && ::File.exist?("#{node['nginx']['dir']}/sites-enabled/#{new_resource.hostname}_certbot") &&
!::File.exist?("/etc/letsencrypt/live/#{new_resource.hostname}/fullchain.pem") !::File.exist?("/etc/letsencrypt/live/#{new_resource.hostname}/fullchain.pem")

1
site-cookbooks/kosmos-hubot/attributes/default.rb
View File

@ -18,6 +18,7 @@ node.default['hal8000_xmpp']['rooms'] = [
'kosmos@kosmos.chat', 'kosmos@kosmos.chat',
'kosmos-dev@kosmos.chat', 'kosmos-dev@kosmos.chat',
'kredits@kosmos.chat', 'kredits@kosmos.chat',
'info@kosmos.chat'
] ]
node.default['hal8000_xmpp']['auth_admins'] = [] node.default['hal8000_xmpp']['auth_admins'] = []

4
site-cookbooks/kosmos-mediawiki/attributes/default.rb
View File

@ -1,4 +1,4 @@
node.default["mediawiki"]["url"] = "https://wiki.kosmos.org/" node.default["mediawiki"]["url"] = "https://wiki.kosmos.org/"
node.default["mediawiki"]["hubot_base_url"] = "http://barnard.kosmos.org:8080" node.default["mediawiki"]["hubot_base_url"] = "https://hal8000.chat.kosmos.org"
node.default["mediawiki"]["hubot_room"] = "#kosmos" node.default["mediawiki"]["hubot_room"] = "info@kosmos.chat"
node.default["mediawiki"]["ldap_enabled"] = true node.default["mediawiki"]["ldap_enabled"] = true

2
site-cookbooks/kosmos-mediawiki/recipes/default.rb
View File

@ -119,7 +119,7 @@ ark "MediawikiHubot" do
action :cherry_pick action :cherry_pick
end end
hubot_credentials = Chef::EncryptedDataBagItem.load('credentials', 'hal8000_freenode') hubot_credentials = Chef::EncryptedDataBagItem.load('credentials', 'hal8000_xmpp')
webhook_token = hubot_credentials['webhook_token'] webhook_token = hubot_credentials['webhook_token']
template "#{node['mediawiki']['webdir']}/extensions/MediawikiHubot/DefaultConfig.php" do template "#{node['mediawiki']['webdir']}/extensions/MediawikiHubot/DefaultConfig.php" do