Fixing #796 -- the fileserver can now start with no

configuration file (it creates both default mount points
if it does) and puppetmasterd no longer requires the
configuration file to exist.

1 files changed, 1 insertions, 12 deletions

diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index b782969a8..bae11c831 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -103,7 +103,6 @@ result = GetoptLong.new(*options)
 master = {}
 ca = {}
 report = {}
-fs = {}
 bucket = {}
 
 options = {
@@ -193,6 +192,7 @@ require 'etc'
 
 handlers = {
     :Status => {},
+    :FileServer => {}
 }
 
 if options[:havemaster]
@@ -225,17 +225,6 @@ if Puppet[:parseonly]
     exit(0)
 end
 
-if File.exists?(Puppet[:fileserverconfig])
-    fs[:Config] = Puppet[:fileserverconfig]
-#else
-#    Puppet.notice "File server config %s does not exist; skipping file serving" %
-#        Puppet[:fileserverconfig]
-end
-
-if fs.include?(:Config)
-    handlers[:FileServer] = fs
-end
-
 webserver = server = nil
 begin
     case Puppet[:servertype]