[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r660: More tweaks to ftp.

Jeff Licquia licquia at linuxfoundation.org
Thu Mar 26 23:42:07 UTC 2015


------------------------------------------------------------
revno: 660
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Thu 2015-03-26 19:42:07 -0400
message:
  More tweaks to ftp.
removed:
  modules/apachehttpd/manifests/files.pp
modified:
  manifests/nodes/lsb2.pp
  modules/ftp/manifests/init.pp
-------------- next part --------------
=== modified file 'manifests/nodes/lsb2.pp'
--- a/manifests/nodes/lsb2.pp	2015-03-26 20:45:17 +0000
+++ b/manifests/nodes/lsb2.pp	2015-03-26 23:42:07 +0000
@@ -13,8 +13,7 @@
     include mail::linuxbase
 
     include apachehttpd, apachehttpd::vhosts, apachehttpd::betaspecs,
-            apachehttpd::modules, apachehttpd::ssl, apachehttpd::linuxbase,
-            apachehttpd::files
+            apachehttpd::modules, apachehttpd::ssl, apachehttpd::linuxbase
 
     include apachehttpd::qa
 

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

=== modified file 'modules/ftp/manifests/init.pp'
--- a/modules/ftp/manifests/init.pp	2014-06-10 18:30:56 +0000
+++ b/modules/ftp/manifests/init.pp	2015-03-26 23:42:07 +0000
@@ -20,7 +20,8 @@
 
     file { '/srv/ftp/incoming':
         ensure => directory,
-        mode   => 0777,
+        mode   => 0700,
+        owner  => ftp,
     }
 
     # Scripts for updating information on the FTP server.



More information about the lsb-messages mailing list