Merge branch 'master' into feature/107-ldap_server

Merge branch 'chore/enable_wiki_editor_toolbar' of kosmos/chef into master
Enable wiki editor toolbar
2019-12-04 15:52:08 +01:00 · 2019-11-29 16:38:08 +00:00 · 2019-11-26 22:04:49 +01:00 · 2019-11-22 16:19:52 +00:00 · 2019-11-22 14:37:29 +01:00 · 2019-11-15 14:49:45 +00:00
5 changed files with 6 additions and 3 deletions
--- a/site-cookbooks/kosmos-hubot/attributes/default.rb
+++ b/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",
--- a/site-cookbooks/kosmos-hubot/recipes/hal8000.rb
+++ b/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",
--- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb
+++ b/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
--- a/site-cookbooks/kosmos-nginx/metadata.rb
+++ b/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'
--- a/site-cookbooks/kosmos-nginx/resources/nginx_certbot_site.rb
+++ b/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
Author	SHA1	Message	Date
Greg Karékinian	9e4f12b1b1	Merge branch 'master' into feature/107-ldap_server	2019-12-04 15:52:08 +01:00
gregkare	aecdaabbcc	Merge branch 'chore/enable_wiki_editor_toolbar' of kosmos/chef into master	2019-11-29 16:38:08 +00:00
Sebastian Kippe	678286d758	Enable wiki editor toolbar Enables the formatting toolbar for the wiki editor.	2019-11-26 22:04:49 +01:00
gregkare	056a3eb0d6	Merge branch 'bugfix/letsencrypt_regenerate_template' of kosmos/chef into master	2019-11-22 16:19:52 +00:00
Greg Karékinian	db4e2777d4	Fix a bug preventing nginx from being reloaded after generating a cert Change the notifies property to :immediately in nginx_certbot_site. This way the vhost template is recreated and then triggers a reload of the nginx service. The previous code resulted in nginx not being reloaded, as the action had already been queued earlier.	2019-11-22 14:37:29 +01:00
galfert	22400b929e	Merge branch 'feature/no_tweets_for_xmpp_hal8000' of kosmos/chef into master	2019-11-15 14:49:45 +00:00
Garret Alfert	bd3ef8b635	Remove tweet reading from XMPP Hubot Because of the wormhole feature between XMPP and IRC, any links to tweets will be read by the hal8000 bots on both platforms. This change removes the Tweet reading extension from the XMPP version of the bot.	2019-11-15 14:43:56 +01:00
Garret Alfert	90aebe54de	Revert "Remove tweet reading from IRC Hubot" This reverts commit `d5fc7ad105`.	2019-11-15 14:37:19 +01:00