Updated READ ME and example ManagedInstalls.plist to better match current defaults.

git-svn-id: http://munki.googlecode.com/svn/trunk@481 a4e17f2e-e282-11dd-95e1-755cbddbdd66

Preferences/ManagedInstalls.plist

@@ -6,15 +6,23 @@
   <string>/Library/Managed Installs</string>
   <key>ManifestURL</key>
   <string>http://webserver/repo/manifests/</string>
+  <key>CatalogURL</key>
+  <string>http://webserver/repo/catalogs/</string>
+  <key>PackageURL</key>
+  <string>http://webserver/repo/pkgs/</string>
   <key>ClientIdentifier</key>
-  <string>arbitrary_catalog_name</string>
-  <key>SoftwareRepoURL</key>
-  <string>http://webserver/repo</string>
+  <string>arbitrary_manifest_name</string>
   <key>UseClientCertificate</key>
   <false/>
-  <key>LoggingLevel</key>
-  <integer>1</integer>
   <key>DaysBetweenNotifications</key>
   <integer>1</integer>
+  <key>InstallAppleSoftwareUpdates</key>
+  <false/>
+  <key>SoftwareUpdateServerURL</key>
+  <string></string>
+  <key>LogFile</key>
+  <string>/Library/Managed Installs/Logs/ManagedSoftwareUpdate.log</string>
+  <key>LoggingLevel</key>
+  <integer>1</integer>
 </dict>
 </plist>

Preferences/READ ME.txt

@@ -1,11 +1,37 @@
 The tools get their configuration from /Library/Preferences/ManagedInstalls.plist
-If the file is missing munki uses these defaults:
+If the file or any of the keys are missing, munki uses these defaults:
 
+# where munki writes its install/remove metadata, caches install packages, 
+# and writes reports and logs
 prefs['ManagedInstallDir'] = "/Library/Managed Installs"
-prefs['ManifestURL'] = "http:/munki/repo/manifests/"
-prefs['SoftwareRepoURL'] = "http:/munki/repo"
-prefs['LoggingLevel'] = 1
-prefs['ClientIdentifier'] = (fully-qualified hostname)
-prefs['InstallAppleSoftwareUpdates'] = False
-prefs['SoftwareUpdateServerURL'] = None
+
+# this one is a convenience; if you set this one and do not set
+# ManifestURL, CatalogURL or PackageURL, the other URLs will
+# be built relative to the SoftwareRepoURL
+prefs['SoftwareRepoURL'] = "http://munki/repo"
+
+# The next three are preferred to SoftwareRepoURL;
+# They allow you to serve manifests and catalogs from
+# one server and packages from another. If they exist
+# in the plist, they take precedence over the URL implied
+# by SoftwareRepoURL
+prefs['ManifestURL'] = "http://munki/repo/manifests/"
+prefs['CatalogURL'] = "http://munki/repo/catalogs/"
+prefs['PackageURL'] = "http://munki/repo/pkgs/"
+
+# use SSL client certificates to secure communication with the webserver
 prefs['UseClientCertificate'] = False
+
+prefs['ClientIdentifier'] = '' (munki will use the FQDN, then short hostname, then look for site_default)
+prefs['LogFile'] = "/Library/Managed Installs/Logs/ManagedSoftwareUpdate.log"
+prefs['LoggingLevel'] = 1
+
+# URL for an internal Apple Software Update Server.
+# Delete the key or set it to an empty string to use Apple's SUS.
+prefs['SoftwareUpdateServerURL'] = '' (use Apple's if this is empty)
+prefs['InstallAppleSoftwareUpdates'] = False
+
+# Number of days between user notifications from Managed Software Update.
+prefs['DaysBetweenNotifications'] = 1
+
+