Merge remote-tracking branch 'github/pull/459'

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

diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb
index deaf9a0d26132cff92f4bbcfee8355e359d046da..a2edd32faf14262009b2448f4136000adc670036 100644 (file)
--- a/cookbooks/rsyncd/recipes/default.rb
+++ b/cookbooks/rsyncd/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: rsyncd
+# Cookbook:: rsyncd

 # Recipe:: default
 #
 # 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -25,19 +25,30 @@ hosts_deny = {}
 node[:rsyncd][:modules].each do |name, details|
   hosts_allow[name] = details[:hosts_allow] || []
 
 node[:rsyncd][:modules].each do |name, details|
   hosts_allow[name] = details[:hosts_allow] || []
 

-  hosts_allow[name] |= search(:node, details[:nodes_allow]).collect do |n|
-    n.ipaddresses(:role => :external)
-  end.flatten if details[:nodes_allow]
+  if details[:nodes_allow]
+    hosts_allow[name] |= search(:node, details[:nodes_allow]).collect do |n|
+      n.ipaddresses(:role => :external)
+    end.flatten
+  end

 
   hosts_deny[name] = details[:hosts_deny] || []
 
 
   hosts_deny[name] = details[:hosts_deny] || []
 

+  next unless details[:nodes_deny]
+

   hosts_deny[name] |= search(:node, details[:nodes_deny]).collect do |n|
     n.ipaddresses(:role => :external)
   hosts_deny[name] |= search(:node, details[:nodes_deny]).collect do |n|
     n.ipaddresses(:role => :external)

-  end.flatten if details[:nodes_deny]
+  end.flatten

 end
 
 package "rsync"
 
 end
 
 package "rsync"
 

+systemd_service "rsync-override" do
+  service "rsync"
+  dropin "override"
+  exec_start "/usr/bin/rsync --daemon --no-detach --bwlimit=16384"
+  notifies :restart, "service[rsync]"
+end
+

 service "rsync" do
   action [:enable, :start]
   supports :status => true, :restart => true
 service "rsync" do
   action [:enable, :start]
   supports :status => true, :restart => true


@@ -47,7 +58,7 @@ template "/etc/default/rsync" do
   source "rsync.erb"
   owner "root"
   group "root"
   source "rsync.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   notifies :restart, "service[rsync]"
 end
 
   notifies :restart, "service[rsync]"
 end
 


@@ -55,7 +66,7 @@ template "/etc/rsyncd.conf" do
   source "rsyncd.conf.erb"
   owner "root"
   group "root"
   source "rsyncd.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   variables :hosts_allow => hosts_allow, :hosts_deny => hosts_deny
 end
 
   variables :hosts_allow => hosts_allow, :hosts_deny => hosts_deny
 end