From ef9f700ef043859d5666f35df7c423196e3080e5 Mon Sep 17 00:00:00 2001
From: Greg Neagle <gregneagle@mac.com>
Date: Fri, 22 May 2009 19:19:37 +0000
Subject: [PATCH] Updated READ MEs and sample ManagedInstalls.plist.

git-svn-id: http://munki.googlecode.com/svn/trunk@90 a4e17f2e-e282-11dd-95e1-755cbddbdd66
---
 Preferences/ManagedInstalls.plist | 10 ++++++++--
 Preferences/READ ME.txt           |  9 ++++++---
 READ ME FIRST.txt                 | 10 ++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Preferences/ManagedInstalls.plist b/Preferences/ManagedInstalls.plist
index 530232e6..66bc0572 100644
--- a/Preferences/ManagedInstalls.plist
+++ b/Preferences/ManagedInstalls.plist
@@ -5,10 +5,16 @@
   <key>managed_install_dir</key>
   <string>/Library/Managed Installs</string>
   <key>manifest_url</key>
-  <string>http://webserver/swrepo/catalogs/</string>
+  <string>http://webserver/repo/manifests/</string>
   <key>client_identifier</key>
   <string>arbitrary_catalog_name</string>
   <key>sw_repo_url</key>
-  <string>http://webserver/swrepo</string>
+  <string>http://webserver/repo</string>
+  <key>logging_level</key>
+  <integer>1</integer>
+  <key>do_apple_softwareupdate</key>
+  <false/>
+  <key>softwareupdateserver_url</key>
+  <string>http://xserve.myorg.com:8088/</string>
 </dict>
 </plist>
\ No newline at end of file
diff --git a/Preferences/READ ME.txt b/Preferences/READ ME.txt
index ac4379fc..09d56efa 100644
--- a/Preferences/READ ME.txt	
+++ b/Preferences/READ ME.txt	
@@ -1,7 +1,10 @@
 The tools get their configuration from /Library/Preferences/ManagedInstalls.plist
-Currently only four values are defined, and if the file is missing munki uses these defaults:
+If the file is missing munki uses these defaults:
 
 prefs['managed_install_dir'] = "/Library/Managed Installs"
-prefs['manifest_url'] = "http:/managedinstalls/cgi-bin/getmanifest"
-prefs['sw_repo_url'] = "http://managedinstalls/swrepo"
+prefs['manifest_url'] = "http:/munki/repo/manifests/"
+prefs['sw_repo_url'] = "http:/munki/repo"
+prefs['logging_level'] = 1
 prefs['client_identifier'] = (fully-qualified hostname)
+prefs['do_apple_softwareupdate'] = False
+prefs['softwareupdateserver_url'] = None
diff --git a/READ ME FIRST.txt b/READ ME FIRST.txt
index 1935ec50..d4c31f12 100644
--- a/READ ME FIRST.txt	
+++ b/READ ME FIRST.txt	
@@ -79,12 +79,14 @@ Change the managed_install_dir key to point to your desired directory. My eventu
 Change the manifest_url in /Library/Preferences/ManagedInstalls.plist to http:/yourwebserver/repo_root/manifests/
 Change the client_identifier to the name of the actual catalog file on the webserver (perhaps simply client_manifest.plist for now...)
 Change the sw_repo_url to the url to repo_root.
-Copy this file to /Library/Preferences.
+Copy this file to /Library/Preferences/.
 
 Now, from the code/client directory:
 
 Run installcheck.  You should get a copy of the client_manifest.plist in your managed_install_dir/manifests/. It should get more info on the items in the manifest by consulting the catalog(s) and decide if they need to be installed.  If so, the installer items will be copied to managed_install_dir/Cache/
-Finally: as root, run ManagedInstaller, and the items in managed_install_dir/Cache should be installed.  Logs from this process go in managed_install_dir/Logs
+The process logs its activities at managed_install_dir/Logs/ManagedInstallerCheck.log
+
+Finally: as root, run managedinstaller, and the items in managed_install_dir/Cache should be installed.  Logs from this process go in managed_install_dir/Logs/ManagedInstaller.log
 
 
 More notes:
@@ -110,11 +112,11 @@ For items that are not installed, or have an older version, we download installe
 Using the dependency info and the catalog items, we build a list of items to be installed and their order. (InstallInfo.plist)
 
 
-Tool: ManagedSoftwareUpdate.app
+Tool: Managed Software Update.app
 This app will be used to notify the user that there are updates to be installed, and ask them to log out to have them installed, or notify them that they will be installed at next logout.
 
 
-Tool: ManagedInstaller
+Tool: managedinstaller
 This tool uses the InstallInfo.plist file generated by installcheck (to determine install order) and the staged installer items and installs everything, removing the cached installer items as they are installed.  If a reboot is required, the machine is rebooted after all installs are complete.