X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4e9f478944695246f83b4173794c36855770b821..e1bc94ff7a1970c8bc669a034ffbf7d0165e510a:/cookbooks/ftp/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/ftp/recipes/default.rb b/cookbooks/ftp/recipes/default.rb index 53fc9423c..9cd534a0b 100644 --- a/cookbooks/ftp/recipes/default.rb +++ b/cookbooks/ftp/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: FTP +# Cookbook:: FTP # Recipe:: default # -# Copyright 2018, OpenStreetMap Foundation +# Copyright:: 2018, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,14 +26,14 @@ template "/etc/vsftpd.conf" do 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" - mode 0o644 + mode "644" end service "vsftpd" do @@ -45,9 +45,8 @@ end firewall_rule "accept-ftp-tcp" do action :accept - source "net" - dest "fw" - proto "tcp" + context :incoming + protocol :tcp dest_ports "ftp" - source_ports "-" + helper "ftp" end