Merge branch 'master' into feature/107-ldap_server

site-cookbooks/kosmos-hubot/attributes/default.rb

@@ -7,7 +7,7 @@ node.default['hal8000_xmpp']['http_port'] = 8082
 node.default['hal8000_xmpp']['domain'] = "hal8000.chat.kosmos.org"
 
 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-tell", "hubot-seen", "hubot-rss-reader",
   "hubot-incoming-webhook", "hubot-auth",

site-cookbooks/kosmos-hubot/recipes/hal8000.rb

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

site-cookbooks/kosmos-mediawiki/recipes/default.rb

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

site-cookbooks/kosmos-nginx/metadata.rb

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

site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb

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