X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/bdd668242ccb1695dbba0c3267a7fee6a5565d5c..31f1fa863c0b208a44e10ef3ae1571024ef0f0ae:/cookbooks/spamassassin/recipes/default.rb diff --git a/cookbooks/spamassassin/recipes/default.rb b/cookbooks/spamassassin/recipes/default.rb index bbea0159b..db498b75f 100644 --- a/cookbooks/spamassassin/recipes/default.rb +++ b/cookbooks/spamassassin/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: spamassassin +# Cookbook:: spamassassin # Recipe:: default # -# Copyright 2011, OpenStreetMap Foundation +# Copyright:: 2011, 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, @@ -19,40 +19,46 @@ package "spamassassin" -service "spamassassin" do - action [ :enable, :start ] +service_name = if platform?("debian") + "spamd" + else + "spamassassin" + end + +service service_name do + action [:enable, :start] supports :status => true, :restart => true, :reload => true end directory "/var/spool/spamassassin" do - owner "mail" - group "mail" - mode 0755 + owner "debian-spamd" + group "debian-spamd" + mode "755" end template "/etc/default/spamassassin" do source "spamassassin.erb" owner "root" group "root" - mode 0644 - notifies :restart, "service[spamassassin]" + mode "644" + notifies :restart, "service[#{service_name}]" end trusted_networks = node[:exim][:relay_from_hosts] if node[:exim][:smarthost_name] search(:node, "exim_smarthost_via:#{node[:exim][:smarthost_name]}\\:*").each do |host| - trusted_networks = trusted_networks | host.ipaddresses(:role => :external) + trusted_networks |= host.ipaddresses(:role => :external) end end -trusted_networks = trusted_networks - [ "127.0.0.1", "::1" ] +trusted_networks -= ["127.0.0.1", "::1"] template "/etc/spamassassin/local.cf" do source "local.cf.erb" owner "root" group "root" - mode 0644 + mode "644" variables :trusted_networks => trusted_networks.sort - notifies :restart, "service[spamassassin]" + notifies :restart, "service[#{service_name}]" end