From 40851f8310a672f47caaaa2fb8a6fc2e2c2e8532 Mon Sep 17 00:00:00 2001 From: Samuel Keeley Date: Tue, 17 Nov 2015 15:53:35 -0800 Subject: [PATCH 1/2] Pendantic pendantary Back to the Mac (OS X 10.6.6) --- code/client/makepkginfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/client/makepkginfo b/code/client/makepkginfo index 70a49ba6..e08ea380 100755 --- a/code/client/makepkginfo +++ b/code/client/makepkginfo @@ -587,7 +587,7 @@ def main(): '--installer_choices_xml', '--installer-choices-xml', action='store_true', help=('Generate installer choices for metapackages. ' - 'Note: Requires OS X 10.6.6 or later.') + 'Note: Requires Mac OS X 10.6.6 or later.') ) apple_options.add_option( '--installer_environment', '--installer-environment', '-E', From 0ddbb72350e46b39a1e583a008138a16d8b60ff8 Mon Sep 17 00:00:00 2001 From: Samuel Keeley Date: Tue, 17 Nov 2015 16:01:18 -0800 Subject: [PATCH 2/2] Markdown formatting --- Preferences/README.md | 54 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/Preferences/README.md b/Preferences/README.md index f503effc..3d103076 100644 --- a/Preferences/README.md +++ b/Preferences/README.md @@ -1,40 +1,38 @@ The tools get their configuration from /Library/Preferences/ManagedInstalls.plist 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" +**Where munki writes its install/remove metadata, caches install packages, and writes reports and logs** -# 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" + prefs['ManagedInstallDir'] = "/Library/Managed Installs" -# 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/" +**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** -# use SSL client certificates to secure communication with the webserver -prefs['UseClientCertificate'] = False + prefs['SoftwareRepoURL'] = "http://munki/repo" -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 +**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** -# 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 + prefs['ManifestURL'] = "http://munki/repo/manifests/" + prefs['CatalogURL'] = "http://munki/repo/catalogs/" + prefs['PackageURL'] = "http://munki/repo/pkgs/" -# Number of days between user notifications from Managed Software Update. -prefs['DaysBetweenNotifications'] = 1 +**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) + +**Location for logging and verbosity** + + 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 The example ManagedInstalls.plist in this directory is not meant to be used as-is, but rather as a starting point. You will need to modify it to match your needs. - -