[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r659: Tweak ftp site settings.

[Jeff Licquia]

------------------------------------------------------------
revno: 659
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2015-03-26 16:45:17 -0400
message:
  Tweak ftp site settings.
added:
  modules/apachehttpd/manifests/files.pp
modified:
  manifests/nodes/lsb2.pp
  modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf
  modules/ftp/files/vsftpd.conf
-------------- next part --------------
=== modified file 'manifests/nodes/lsb2.pp'
--- a/manifests/nodes/lsb2.pp	2014-11-21 16:49:33 +0000
+++ b/manifests/nodes/lsb2.pp	2015-03-26 20:45:17 +0000
@@ -13,7 +13,8 @@
     include mail::linuxbase
 
     include apachehttpd, apachehttpd::vhosts, apachehttpd::betaspecs,
-            apachehttpd::modules, apachehttpd::ssl, apachehttpd::linuxbase
+            apachehttpd::modules, apachehttpd::ssl, apachehttpd::linuxbase,
+            apachehttpd::files
 
     include apachehttpd::qa
 

=== modified file 'modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf'
--- a/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf	2014-07-24 17:31:42 +0000
+++ b/modules/apachehttpd/files/vhosts.d/lsb2.linux-foundation.org/files.conf	2015-03-26 20:45:17 +0000
@@ -37,6 +37,8 @@
     # configures the footer on server-generated documents
     ServerSignature On
 
+    # be sure to disable PHP on this vhost
+    php_admin_flag engine off
 
     # Optionally, include *.conf files from /etc/apache2/conf.d/
     #
@@ -107,7 +109,7 @@
 	# http://httpd.apache.org/docs-2.2/mod/core.html#options
 	# for more information.
 	#
-	Options Indexes FollowSymLinks
+	Options Indexes
     
 	#
 	# AllowOverride controls what directives may be placed in .htaccess files.

=== added file 'modules/apachehttpd/manifests/files.pp'
--- a/modules/apachehttpd/manifests/files.pp	1970-01-01 00:00:00 +0000
+++ b/modules/apachehttpd/manifests/files.pp	2015-03-26 20:45:17 +0000
@@ -0,0 +1,14 @@
+class apachehttpd::files {
+
+    include apachehttpd
+
+    include apachehttpd::vhosts
+
+    file { '/data/ftp/incoming':
+        ensure => directory,
+        mode   => 0700,
+        owner  => ftp,
+    }
+
+}
+

=== modified file 'modules/ftp/files/vsftpd.conf'
--- a/modules/ftp/files/vsftpd.conf	2012-03-21 20:27:41 +0000
+++ b/modules/ftp/files/vsftpd.conf	2015-03-26 20:45:17 +0000
@@ -120,8 +120,8 @@
 # a different user. Note! Using "root" for uploaded files is not
 # recommended!
 #
-#chown_uploads=YES
-#chown_username=whoever
+chown_uploads=YES
+chown_username=nobody
 #
 # The maximum data transfer rate permitted, in bytes per second, for anonymous
 # authenticated users. The default is 0 (unlimited).