Commit Graph

1405 Commits

Author SHA1 Message Date
Greg Neagle 9f7a0598dc Merge branch 'master' of https://github.com/munki/munki
Conflicts:
	code/client/makecatalogs
2015-01-23 11:34:56 -08:00
Greg Neagle e4fb9cac47 PyLint cleanups for makecatalogs; also define errors array before use by iconhashing code 2015-01-23 11:26:19 -08:00
Samuel Keeley a85a071745 pylint fixes 2015-01-23 11:25:25 -08:00
Samuel Keeley be33651d43 remove one more line 2015-01-22 23:00:55 -08:00
Samuel Keeley 3f0af4438d simplification 🍐 2015-01-22 22:01:18 -08:00
Samuel Keeley 94cf5870bc more 80 chars and suggested simplification 2015-01-22 14:17:57 -08:00
Samuel Keeley a7ceae35d4 remove redundancy and lines > 80 chars 2015-01-22 14:11:17 -08:00
Samuel Keeley 93659f0c63 add .png to icon_name check 2015-01-21 11:20:36 -08:00
Samuel Keeley eda254fefa fix a bunch of problems with icon hashing 2015-01-21 09:24:46 -08:00
Samuel Keeley 3bb3b62b13 sha256 2015-01-21 07:46:50 -08:00
Samuel Keeley d71a4e4708 don't break when no icons directory 2015-01-21 07:42:38 -08:00
Samuel Keeley 4e3bd4f0f2 iconspath 2015-01-20 22:01:18 -08:00
Samuel Keeley c22537aa3d modify makecatalogs to automatically generate icon hashes and insert them into catalogs 2015-01-20 21:43:46 -08:00
Greg Neagle c88ce43b65 Don't warn about no receipts or installs array for pkginfo for profiles 2015-01-20 21:34:46 -08:00
Greg Neagle 7f9f99f6e5 When creating pkginfo for a configuration profile, set minimum_munki_version to 2.2 2015-01-20 08:24:06 -08:00
Arjen van Bochoven c3577c210a Added support for icon_hash to munkiimport 2015-01-19 22:49:57 +01:00
Greg Neagle e660411348 When installing a profile, properly get and record the result of the install 2015-01-16 12:04:39 -08:00
eigerman d0fb81c99e Merge remote-tracking branch 'upstream/master'
Conflicts:
	code/client/munkilib/updatecheck.py
2015-01-16 12:37:36 -05:00
Edward Eigerman d1cb27211a Update updatecheck.py 2015-01-16 09:14:56 -05:00
Edward Eigerman 3d7e743be6 Update updatecheck.py 2015-01-15 17:21:56 -05:00
Edward Eigerman 8800c7cf39 Update updatecheck.py 2015-01-15 17:20:14 -05:00
Greg Neagle 9c9ac8dcdd On items_to_copy, if destination_path is not specified, extract path from destination_item if it exists 2015-01-15 07:00:48 -08:00
Edward Eigerman d4875c9f1d Update updatecheck.py 2015-01-14 12:29:30 -05:00
Edward Eigerman 5a28ceb5bf Update updatecheck.py 2015-01-14 12:23:54 -05:00
Edward Eigerman 06b9247ce0 Update updatecheck.py 2015-01-14 12:23:26 -05:00
Greg Neagle a4a0d9d544 Merge config-profile-support into master 2015-01-13 06:55:24 -08:00
Greg Neagle 0c68a317b7 Catch more exceptions when processing conditional_items 2015-01-12 08:23:40 -08:00
Greg Neagle 58d8a07dec Clean up the tmpdir on exit of iconimporter, makepkginfo and munkiimport 2015-01-09 15:08:52 -08:00
Greg Neagle a621238272 Bumping version to 2.1.1 2015-01-09 06:27:37 -08:00
Greg Neagle fc8ab4a438 Since there are now more possible triggers that require building a new munki.keychain, always build a new munki.keychain if a client cert exists. 2015-01-08 14:09:10 -08:00
Greg Neagle aeee99ee84 Add identity preferences for all URLs defined in Munki's preferences, not just SoftwareRepoURL 2015-01-08 11:17:52 -08:00
Greg Neagle ea264b9e12 Switch to a more 'correct' method of reading a signed configuration profile, using the 'security cms' tool. 2014-12-29 08:33:38 -08:00
Greg Neagle 1d4c8497bc Document yet another way to read signed profiles 2014-12-18 08:48:23 -08:00
Greg Neagle acc674860a Validate profile receipts before attempting to use them 2014-12-17 19:01:34 -08:00
Greg Neagle 0e08697252 Also track ProfileInstallDate in our profiles receipt database 2014-12-17 18:43:05 -08:00
Greg Neagle 0a517f13a4 Added note about alternative method for extracting profile data from a signed profile 2014-12-17 14:07:55 -08:00
Greg Neagle cb81e4616a Support for signed profiles. 2014-12-17 11:54:06 -08:00
Greg Neagle 64ae22c36d makepkginfo can now handle profiles that are missing the PayloadDescription field. 2014-12-17 10:16:08 -08:00
Greg Neagle 988379d980 Bump version plist to reflect feature additions 2014-12-17 06:41:21 -08:00
Greg Neagle b61a858f66 Add uninstallable=True to generated pkginfo; check that a profile is a "Configuration" profile (not "configuration") 2014-12-17 06:09:02 -08:00
Greg Neagle 83fabfb5ce Add support for importing, installing and removing configuration profiles. 2014-12-16 21:57:41 -08:00
Greg Neagle 2afd2606a8 Don't print message about adding CA certs to System.keychain since we might do this every single run 2014-12-16 10:06:03 -08:00
Greg Neagle 7e6556fe2c More error checking around converting a string into a buffer object. 2014-12-02 07:00:01 -08:00
Greg Neagle 716071ec8a Do not ignore unattended_installs when the RestartAction is literally 'None'. 2014-12-02 06:58:56 -08:00
Greg Neagle cacb4524fa Merge pull request #415 from jlrgraham/munkiimport_icon
munkiimport: Add argument to specify package icon
2014-12-01 21:43:10 -08:00
Greg Neagle a8b805320c Merge pull request #424 from erikng/master
Increase network wait time before Munki run.
2014-12-01 15:17:59 -08:00
Erik Gomez 19524fe259 Update managedsoftwareupdate
Refresh time now one second.
2014-11-25 10:16:41 -06:00
Greg Neagle 1f058ffdc3 Don't check installeritem path if we are importing an Apple metadata item. 2014-11-24 19:20:12 -08:00
Greg Neagle 63a3b69775 Always return a plist when --verify-options-only is given. Fixes issues with --apple-update and --nopkg when given to munkiimport. 2014-11-24 18:51:10 -08:00
Erik Gomez 130152b801 Update managedsoftwareupdate 2014-11-22 23:54:44 -06:00