Drop necrosan role

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

diff --git a/cookbooks/ftp/recipes/default.rb b/cookbooks/ftp/recipes/default.rb
index 21153f4c440f49f1f0adac5db183edf194ae654b..9cd534a0b98d7022f9c43a845ceebcdd4d7121c5 100644 (file)
--- a/cookbooks/ftp/recipes/default.rb
+++ b/cookbooks/ftp/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: FTP
+# Cookbook:: FTP

 # Recipe:: default
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,26 +17,36 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-package "vsftpd"
+package %w[
+  vsftpd
+  libpam-pwdfile
+]

 
 template "/etc/vsftpd.conf" do
   source "vsftpd.conf.erb"
   owner "root"
   group "root"
 
 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 "644"

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

-  action [:enable] # Do not start the service as config may be broken from failed chef run
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "template[/etc/vsftpd.conf]"
   supports :status => true, :restart => true, :reload => true
   subscribes :restart, "template[/etc/vsftpd.conf]"

+  subscribes :restart, "template[/etc/pam.d/vsftpd]"

 end
 
 firewall_rule "accept-ftp-tcp" do
   action :accept
 end
 
 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
 end