Revert to civicrm 4.6.26

[chef.git] / cookbooks / supybot / recipes / default.rb

diff --git a/cookbooks/supybot/recipes/default.rb b/cookbooks/supybot/recipes/default.rb
index 7dd59bf36f48c6a88ac5b1e4080fd7a9f0f7a162..7f9953526084e2bd9ae64033d3a30425dd539527 100644 (file)
--- a/cookbooks/supybot/recipes/default.rb
+++ b/cookbooks/supybot/recipes/default.rb
@@ -21,18 +21,19 @@ users = data_bag_item("supybot", "users")
 passwords = data_bag_item("supybot", "passwords")
 
 package "supybot"
 passwords = data_bag_item("supybot", "passwords")
 
 package "supybot"

+package "python-git"

 
 directory "/etc/supybot" do
   owner "supybot"
   group "supybot"
 
 directory "/etc/supybot" do
   owner "supybot"
   group "supybot"

-  mode 0755
+  mode 0o755

 end
 
 template "/etc/supybot/supybot.conf" do
   source "supybot.conf.erb"
   owner "supybot"
   group "supybot"
 end
 
 template "/etc/supybot/supybot.conf" do
   source "supybot.conf.erb"
   owner "supybot"
   group "supybot"

-  mode 0644
+  mode 0o644

   variables :passwords => passwords
 end
 
   variables :passwords => passwords
 end
 


@@ -40,84 +41,78 @@ template "/etc/supybot/channels.conf" do
   source "channels.conf.erb"
   owner "supybot"
   group "supybot"
   source "channels.conf.erb"
   owner "supybot"
   group "supybot"

-  mode 0644
+  mode 0o644

 end
 
 template "/etc/supybot/git.conf" do
   source "git.conf.erb"
   owner "supybot"
   group "supybot"
 end
 
 template "/etc/supybot/git.conf" do
   source "git.conf.erb"
   owner "supybot"
   group "supybot"

-  mode 0644
+  mode 0o644

 end
 
 template "/etc/supybot/ignores.conf" do
   source "ignores.conf.erb"
   owner "supybot"
   group "supybot"
 end
 
 template "/etc/supybot/ignores.conf" do
   source "ignores.conf.erb"
   owner "supybot"
   group "supybot"

-  mode 0644
+  mode 0o644

 end
 
 template "/etc/supybot/userdata.conf" do
   source "userdata.conf.erb"
   owner "supybot"
   group "supybot"
 end
 
 template "/etc/supybot/userdata.conf" do
   source "userdata.conf.erb"
   owner "supybot"
   group "supybot"

-  mode 0644
+  mode 0o644

 end
 
 template "/etc/supybot/users.conf" do
   source "users.conf.erb"
   owner "supybot"
   group "supybot"
 end
 
 template "/etc/supybot/users.conf" do
   source "users.conf.erb"
   owner "supybot"
   group "supybot"

-  mode 0644
+  mode 0o644

   variables :passwords => users
 end
 
 directory "/var/lib/supybot" do
   owner "root"
   group "root"
   variables :passwords => users
 end
 
 directory "/var/lib/supybot" do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 directory "/var/lib/supybot/data" do
   owner "supybot"
   group "supybot"
 end
 
 directory "/var/lib/supybot/data" do
   owner "supybot"
   group "supybot"

-  mode 0755
+  mode 0o755

 end
 
 directory "/var/lib/supybot/backup" do
   owner "supybot"
   group "supybot"
 end
 
 directory "/var/lib/supybot/backup" do
   owner "supybot"
   group "supybot"

-  mode 0755
+  mode 0o755

 end
 
 directory "/var/lib/supybot/git" do
   owner "supybot"
   group "supybot"
 end
 
 directory "/var/lib/supybot/git" do
   owner "supybot"
   group "supybot"

-  mode 0755
-end
-
-directory "/var/tmp/supybot" do
-  owner "supybot"
-  group "supybot"
-  mode 0755
+  mode 0o755

 end
 
 directory "/var/log/supybot" do
   owner "supybot"
   group "supybot"
 end
 
 directory "/var/log/supybot" do
   owner "supybot"
   group "supybot"

-  mode 0755
+  mode 0o755

 end
 
 directory "/usr/local/lib/supybot" do
   owner "root"
   group "root"
 end
 
 directory "/usr/local/lib/supybot" do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 directory "/usr/local/lib/supybot/plugins" do
   owner "root"
   group "root"
 end
 
 directory "/usr/local/lib/supybot/plugins" do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 git "/usr/local/lib/supybot/plugins/Git" do
 end
 
 git "/usr/local/lib/supybot/plugins/Git" do


@@ -132,11 +127,11 @@ template "/etc/init.d/supybot" do
   source "supybot.init.erb"
   owner "root"
   group "root"
   source "supybot.init.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 service "supybot" do
 end
 
 service "supybot" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :restart => true
   subscribes :restart, "template[/etc/supybot/supybot.conf]"
   subscribes :restart, "template[/etc/supybot/channels.conf]"
   supports :restart => true
   subscribes :restart, "template[/etc/supybot/supybot.conf]"
   subscribes :restart, "template[/etc/supybot/channels.conf]"