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

Merge branch 'master' into feature/107-ldap_server

Browse Source
This commit is contained in:
Greg Karékinian 2019-12-04 15:52:08 +01:00
commit 9e4f12b1b1
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ node.default['hal8000_xmpp']['http_port'] = 8082
node.default['hal8000_xmpp']['domain'] = "hal8000.chat.kosmos.org" node.default['hal8000_xmpp']['domain'] = "hal8000.chat.kosmos.org"
node.default['hal8000_xmpp']['hubot_scripts'] = [ node.default['hal8000_xmpp']['hubot_scripts'] = [
"hubot-help", "hubot-read-tweet", "hubot-redis-brain", "hubot-help", "hubot-redis-brain",
"hubot-rules", "hubot-shipit", "hubot-plusplus", "hubot-rules", "hubot-shipit", "hubot-plusplus",
"hubot-tell", "hubot-seen", "hubot-rss-reader", "hubot-tell", "hubot-seen", "hubot-rss-reader",
"hubot-incoming-webhook", "hubot-auth", "hubot-incoming-webhook", "hubot-auth",

1
site-cookbooks/kosmos-hubot/recipes/hal8000.rb
View File

@ -60,6 +60,7 @@ application hal8000_path do
group "hubot" group "hubot"
content [ content [
"hubot-help", "hubot-help",
"hubot-read-tweet",
"hubot-redis-brain", "hubot-redis-brain",
"hubot-rules", "hubot-rules",
"hubot-shipit", "hubot-shipit",

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

@ -196,6 +196,8 @@ $wgArticlePath = "/$1";
file.insert_line_if_no_match(/Mermaid/, file.insert_line_if_no_match(/Mermaid/,
"wfLoadExtension( 'Mermaid' );") "wfLoadExtension( 'Mermaid' );")
file.insert_line_if_no_match(/WikiEditor/,
"wfLoadExtension( 'WikiEditor' );")
file.write_file file.write_file
end end

2
site-cookbooks/kosmos-nginx/metadata.rb
View File

@ -4,7 +4,7 @@ maintainer_email 'mail@kosmos.org'
license 'MIT' license 'MIT'
description 'Installs/Configures kosmos-nginx' description 'Installs/Configures kosmos-nginx'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '0.3.1' version '0.3.2'
depends 'nginx' depends 'nginx'
depends 'firewall' depends 'firewall'

2
site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb
View File

@ -47,6 +47,6 @@ action :create do
::File.exist?("#{node['nginx']['dir']}/sites-enabled/#{domain}_certbot") && ::File.exist?("#{node['nginx']['dir']}/sites-enabled/#{domain}_certbot") &&
!::File.exist?("/etc/letsencrypt/live/#{domain}/fullchain.pem") !::File.exist?("/etc/letsencrypt/live/#{domain}/fullchain.pem")
end end
notifies :create, "template[#{node['nginx']['dir']}/sites-available/#{site}]", :delayed notifies :create, "template[#{node['nginx']['dir']}/sites-available/#{site}]", :immediately
end end
end end