From d60d5afdd9dc5db8150d2c2785499f8548548791 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 19 May 2020 13:32:25 +0000 Subject: [PATCH] Switch to using limnoria instead of supybot --- cookbooks/supybot/recipes/default.rb | 4 ++-- cookbooks/supybot/templates/default/supybot.conf.erb | 7 +++++++ test/integration/supybot/serverspec/supybot_spec.rb | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cookbooks/supybot/recipes/default.rb b/cookbooks/supybot/recipes/default.rb index 6a14c0085..10119e056 100644 --- 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 fe3c63eb6..7e7769a08 100644 --- 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 97a7db2dc..e5ee25291 100644 --- 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 -- 2.43.2