Switch to using limnoria instead of supybot

diff --git a/cookbooks/supybot/recipes/default.rb b/cookbooks/supybot/recipes/default.rb
index 6a14c00851d6199bf33fdb9cb5ab436342886fe4..10119e0563545f5e36282f8ac939c60af44edb20 100644 (file)
--- a/cookbooks/supybot/recipes/default.rb
+++ b/cookbooks/supybot/recipes/default.rb
@@ -22,8 +22,8 @@ include_recipe "accounts"
 users = data_bag_item("supybot", "users")
 passwords = data_bag_item("supybot", "passwords")
 
-package "supybot"
-package "python-git"
+package "limnoria"
+package "python3-git"
 
 directory "/etc/supybot" do
   owner "supybot"

diff --git a/cookbooks/supybot/templates/default/supybot.conf.erb b/cookbooks/supybot/templates/default/supybot.conf.erb
index fe3c63eb6d2b23a545450497e49cb1ac8e734292..7e7769a084b15444f5630faf05d2573f793aba04 100644 (file)
--- a/cookbooks/supybot/templates/default/supybot.conf.erb
+++ b/cookbooks/supybot/templates/default/supybot.conf.erb
@@ -637,6 +637,13 @@ supybot.directories.data: /var/lib/supybot/data
 ###
 supybot.directories.data.tmp: /var/lib/supybot/data/tmp
 
+###
+# Determines what directory files of the web server (templates, custom images, ...) are put into.
+#
+# Default value: web
+###
+supybot.directories.data.web: /var/lib/supybot/data/web
+
 ###
 # Determines what directory backup data is put into.
 #

diff --git a/test/integration/supybot/serverspec/supybot_spec.rb b/test/integration/supybot/serverspec/supybot_spec.rb
index 97a7db2dc17ce03e65b7df91de27a2eba0862d62..e5ee25291c72c6538bffb62c2bc1a88ad79f3328 100644 (file)
--- a/test/integration/supybot/serverspec/supybot_spec.rb
+++ b/test/integration/supybot/serverspec/supybot_spec.rb
@@ -3,7 +3,7 @@ require "serverspec"
 # Required by serverspec
 set :backend, :exec
 
-describe package("supybot") do
+describe package("limnoria") do
   it { should be_installed }
 end