X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/30ddb9b3036a5eeea2ff3f8adcf3ad0ec1dc500b..4c0a50ccc54784e4d6dc56d797bbb83a73ef99af:/cookbooks/supybot/recipes/default.rb

diff --git a/cookbooks/supybot/recipes/default.rb b/cookbooks/supybot/recipes/default.rb
index c8dc4aab5..87343c100 100644
--- a/cookbooks/supybot/recipes/default.rb
+++ b/cookbooks/supybot/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: supybot
+# Cookbook:: supybot
 # Recipe:: default
 #
-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+include_recipe "accounts"
+
 users = data_bag_item("supybot", "users")
 passwords = data_bag_item("supybot", "passwords")
 
@@ -26,14 +28,14 @@ package "python-git"
 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"
-  mode 0644
+  mode 0o644
   variables :passwords => passwords
 end
 
@@ -41,98 +43,103 @@ template "/etc/supybot/channels.conf" do
   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"
-  mode 0644
+  mode 0o644
 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"
-  mode 0644
+  mode 0o644
 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"
-  mode 0755
+  mode 0o755
 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"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/lib/supybot/git" do
   owner "supybot"
   group "supybot"
-  mode 0755
+  mode 0o755
 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"
-  mode 0755
+  mode 0o755
 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
   action :sync
-  repository "git://github.com/mmueller/supybot-git"
+  repository "https://github.com/openstreetmap/supybot-git"
   revision "master"
   user "root"
   group "root"
 end
 
-template "/etc/init.d/supybot" do
-  source "supybot.init.erb"
-  owner "root"
-  group "root"
-  mode 0755
+systemd_service "supybot" do
+  description "OpenStreetMap IRC Robot"
+  after "network.target"
+  user "supybot"
+  exec_start "/usr/bin/supybot /etc/supybot/supybot.conf"
+  private_tmp true
+  private_devices true
+  protect_system true
+  protect_home true
+  no_new_privileges true
+  restart "on-failure"
 end
 
 service "supybot" do
-  action [ :enable, :start ]
-  supports :restart => true
+  action [:enable, :start]
   subscribes :restart, "template[/etc/supybot/supybot.conf]"
   subscribes :restart, "template[/etc/supybot/channels.conf]"
   subscribes :restart, "template[/etc/supybot/git.conf]"
@@ -140,5 +147,5 @@ service "supybot" do
   subscribes :restart, "template[/etc/supybot/userdata.conf]"
   subscribes :restart, "template[/etc/supybot/users.conf]"
   subscribes :restart, "git[/usr/local/lib/supybot/plugins/Git]"
-  subscribes :restart, "template[/etc/init.d/supybot]"
+  subscribes :restart, "systemd_service[supybot]"
 end