Add logrotate where required

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

diff --git a/cookbooks/ftp/recipes/default.rb b/cookbooks/ftp/recipes/default.rb
index d2c42100c7aee035f1af9b8e1e00789b77f43838..9cd534a0b98d7022f9c43a845ceebcdd4d7121c5 100644 (file)
--- a/cookbooks/ftp/recipes/default.rb
+++ b/cookbooks/ftp/recipes/default.rb
@@ -26,14 +26,14 @@ template "/etc/vsftpd.conf" do
   source "vsftpd.conf.erb"
   owner "root"
   group "root"
   source "vsftpd.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 template "/etc/pam.d/vsftpd" do
   source "pam-vsftpd.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/pam.d/vsftpd" do
   source "pam-vsftpd.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 service "vsftpd" do
 end
 
 service "vsftpd" do


@@ -45,10 +45,8 @@ end
 
 firewall_rule "accept-ftp-tcp" do
   action :accept
 
 firewall_rule "accept-ftp-tcp" do
   action :accept

-  source "net"
-  dest "fw"
-  proto "tcp"
+  context :incoming
+  protocol :tcp

   dest_ports "ftp"
   dest_ports "ftp"

-  source_ports "-"

   helper "ftp"
 end
   helper "ftp"
 end