From: Tom Hughes <tom@compton.nu>
Date: Thu, 4 Jul 2013 10:21:23 +0000 (+0100)
Subject: The supybot tmp directory needs to be inside the data directory
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a77a17afdd8ca38aa431c0f4fad1736ea9b9d91f

The supybot tmp directory needs to be inside the data directory
---

diff --git a/cookbooks/supybot/recipes/default.rb b/cookbooks/supybot/recipes/default.rb
index 7dd59bf36..20385c774 100644
--- a/cookbooks/supybot/recipes/default.rb
+++ b/cookbooks/supybot/recipes/default.rb
@@ -96,12 +96,6 @@ directory "/var/lib/supybot/git" do
   mode 0755
 end
 
-directory "/var/tmp/supybot" do
-  owner "supybot"
-  group "supybot"
-  mode 0755
-end
-
 directory "/var/log/supybot" do
   owner "supybot"
   group "supybot"
diff --git a/cookbooks/supybot/templates/default/supybot.conf.erb b/cookbooks/supybot/templates/default/supybot.conf.erb
index 7bb524ed9..a6bee5686 100644
--- a/cookbooks/supybot/templates/default/supybot.conf.erb
+++ b/cookbooks/supybot/templates/default/supybot.conf.erb
@@ -635,7 +635,7 @@ supybot.directories.data: /var/lib/supybot/data
 #
 # Default value: tmp
 ###
-supybot.directories.data.tmp: /var/tmp/supybot
+supybot.directories.data.tmp: /var/lib/supybot/data/tmp
 
 ###
 # Determines what directory backup data is put into.