X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a68415b8f2bf106b6ea5948b0605c897b516ef4f..45dde9418dd342bb1a632d82559201c0b3becf1a:/cookbooks/supybot/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/supybot/recipes/default.rb b/cookbooks/supybot/recipes/default.rb index 7f9953526..d1c1ea32d 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, @@ -117,22 +117,27 @@ end git "/usr/local/lib/supybot/plugins/Git" do action :sync - repository "git://github.com/mmueller/supybot-git" + repository "git://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 0o755 +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 subscribes :restart, "template[/etc/supybot/supybot.conf]" subscribes :restart, "template[/etc/supybot/channels.conf]" subscribes :restart, "template[/etc/supybot/git.conf]" @@ -140,5 +145,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