Update board wiki to 1.37

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

diff --git a/cookbooks/rsyncd/recipes/default.rb b/cookbooks/rsyncd/recipes/default.rb
index 5f090d1cece202d7adc4196959934be4f9b55a35..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,


@@ -19,10 +19,38 @@
 
 include_recipe "networking"
 
 
 include_recipe "networking"
 

+hosts_allow = {}
+hosts_deny = {}
+
+node[:rsyncd][:modules].each do |name, details|
+  hosts_allow[name] = details[:hosts_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] || []
+
+  next unless details[:nodes_deny]
+
+  hosts_deny[name] |= search(:node, details[:nodes_deny]).collect do |n|
+    n.ipaddresses(:role => :external)
+  end.flatten
+end
+

 package "rsync"
 
 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
 service "rsync" do

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

   supports :status => true, :restart => true
 end
 
   supports :status => true, :restart => true
 end
 


@@ -30,15 +58,16 @@ template "/etc/default/rsync" do
   source "rsync.erb"
   owner "root"
   group "root"
   source "rsync.erb"
   owner "root"
   group "root"

-  mode 0644
-  notifies :restart, resources(:service => "rsync")
+  mode "644"
+  notifies :restart, "service[rsync]"

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

-  mode 0644
+  mode "644"
+  variables :hosts_allow => hosts_allow, :hosts_deny => hosts_deny

 end
 
 firewall_rule "accept-rsync" do
 end
 
 firewall_rule "accept-rsync" do