Fixing a small checksumming bug, reorganizing the client stuff a bit, and adding freshness checking for the configuration, so the config is recompiled every time nor is it downloaded unless it has been recompiled

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@845 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 13 insertions, 0 deletions

diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index 592051e3d..685ff6485 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -61,6 +61,9 @@
 #   configurations.  Defaults to /etc/puppet/manifests/site.pp.
 #
 # noca::
+#   Do not function as a file bucket.
+#
+# noca::
 #   Do not function as a certificate authority.
 #
 # nonodes::
@@ -116,6 +119,7 @@ result = GetoptLong.new(
 	[ "--logdest",	"-l",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--manifest",	"-m",			GetoptLong::REQUIRED_ARGUMENT ],
 	[ "--noca",         			GetoptLong::NO_ARGUMENT ],
+	[ "--nobucket",        			GetoptLong::NO_ARGUMENT ],
 	[ "--nonodes",         			GetoptLong::NO_ARGUMENT ],
 	[ "--parseonly",   			    GetoptLong::NO_ARGUMENT ],
 	[ "--port",	    "-p",			GetoptLong::REQUIRED_ARGUMENT ],
@@ -139,12 +143,15 @@ haveca = true
 master = {}
 ca = {}
 fs = {}
+bucket = {}
 args = {}
 #user = Puppet[:user]
 #group = Puppet[:group]
 user = nil
 group = nil
 
+havebucket = true
+
 parseonly = false
 
 begin
@@ -177,6 +184,8 @@ begin
                 master[:File] = arg
             when "--noca"
                 haveca = false
+            when "--nobucket"
+                havebucket = false
             when "--nonodes"
                 master[:UseNodes] = false
             when "--parseonly"
@@ -271,6 +280,10 @@ if haveca
     handlers[:CA] = ca
 end
 
+#if havebucket
+#    handlers[:FileBucket] = bucket
+#end
+
 unless fs.include?(:Config)
     if File.exists?(Puppet[:fileserverconfig])
         fs[:Config] = Puppet[:fileserverconfig]