mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-05 22:20:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,373 Commits 9 Branches 111 Tags
Munki2
Commit Graph

1540 Commits

Author SHA1 Message Date
verycarefully
d20bd0bdf4 Configure syslog in logouthelper, too 2016-01-08 16:07:05 -05:00
eholtam
ad3be75da2 Cleaned up tabs on 888 and 889 
Cleaned up tab
 2016-01-07 10:47:30 -06:00
eholtam
4b261a6d47 Revert "Cleaned up tabbing" 
This reverts commit fdc031ef83.
 2016-01-07 10:46:12 -06:00
eholtam
fdc031ef83 Cleaned up tabbing 
Cleaned up tabbing.
 2016-01-07 10:45:34 -06:00
eholtam
36514fc748 Fixed manifestutil traceback if no subcommands are given 
In manifestutil if no subcommands are given manifestutil exits with a
trackback.  I added a check to see if the number of subcommands is < 1
and to list the available subcommands if so.
 2016-01-07 10:44:35 -06:00
Greg Neagle
976c842224 Change gurl.py connection timeout to 60 seconds 2015-12-22 14:57:41 -08:00
Greg Neagle
437af40d2b PyLint cleanups 2015-12-09 11:53:14 -08:00
Greg Neagle
c19f2d7936 Simplfy default user-agent header. 2015-12-09 11:41:30 -08:00
Greg Neagle
fda740c046 Merge pull request #537 from mkuron/patch-1 
Set User-Agent header in HTTP requests
 2015-12-09 11:36:46 -08:00
Greg Neagle
d30aa2ca44 Merge pull request #540 from munki/samuel-docs 
Minor internal text updates
 2015-12-09 11:30:39 -08:00
Greg Neagle
37276f5307 Better determination when munkiimport item is an apple_update_metadata item; fixes bug where 'munkiimport --apple-item' worked but 'munkiimport --apple_item' failed, despite makepkginfo --help indicating both syntaxes should work. 2015-12-02 10:54:43 -08:00
Samuel Keeley
4aab73ea65 Merge branch 'samuel-docs' of github.com:munki/munki into samuel-docs 2015-11-20 14:55:23 -08:00
Samuel Keeley
23d2e85545 Merge branch 'master' into samuel-docs 2015-11-20 14:54:19 -08:00
Michael Kuron
918ebc64e4 Fix wrong line break 2015-11-19 09:52:26 +01:00
Michael Kuron
6f0a10f1da Cache default user agent 2015-11-19 09:48:52 +01:00
Justin McWilliams
cec30b1439 Ensure 60, 30, 10 & 5m reboot notices are seen. 
Ensure that 60, 30, 10, and 5 minute notifications are *all* seen before forcefully rebooting a machine, not merely the 60 minute notification.

Previously, if the 60m notice was seen, then the machine was put to sleep for 55m+, it could reboot without another notice after waking up.
 2015-11-18 14:13:53 -08:00
Michael Kuron
0bc12e57bf Python and CFNetwork version in User-Agent 2015-11-18 10:29:59 +01:00
Samuel Keeley
40851f8310 Pendantic pendantary 
Back to the Mac (OS X 10.6.6)
 2015-11-17 15:53:35 -08:00
Samuel Keeley
b44ae33ca0 Update OS X text 2015-11-13 20:57:25 -08:00
Samuel Keeley
67513852fc Replace internal documentation URLs with HTTPS versions 2015-11-13 20:42:50 -08:00
Samuel Keeley
5c12185da4 Replace http://www.apache.org/licenses/LICENSE-2.0 with https://www.apache.org/licenses/LICENSE-2.0 2015-11-13 20:35:24 -08:00
Michael Kuron
088302be1d User-Agent header if other headers are specified 2015-11-13 15:35:29 +01:00
Michael Kuron
d1f9475c54 header_dict_from_list documentation 2015-11-13 15:07:53 +01:00
Michael Kuron
4d36b6afb1 Set User-Agent header in HTTP requests 
Previously Munki only set a User-Agent header on requests made from the appleupdates.py code. Everything else (catalog, manifest, package downloading) reported something like `"Python/2.7.5 CFNetwork/673.6 Darwin/13.4.0 (x86_64) (VMware7%2C1)"` to the server.
 2015-11-13 14:54:54 +01:00
Greg Neagle
436d8c8b46 Bumping version to 2.4.0 for release candidate 2015-11-09 09:18:37 -08:00
Greg Neagle
7e94f2fc73 Merge pull request #534 from grahamgilbert/follow-redirects 
Credit where credit's due
 2015-10-29 09:24:57 -07:00
Graham Gilbert
0459a66f6d Credit where credit's due 2015-10-29 16:22:59 +00:00
Greg Neagle
9da705a1a2 Merge pull request #530 from grahamgilbert/follow-redirects 
Preference to Follow HTTP Recirects
 2015-10-28 10:41:52 -07:00
Justin McWilliams
e9b013dbf7 Log warning when "Products" key is not found in filtered Apple Update catalog 
Log warning when "Products" key is not found in filtered Apple Update catalog
 2015-10-28 12:37:09 -04:00
Greg Neagle
f7f4b70106 Merge pull request #520 from natewalck/master 
Added LocalOnlyManifest feature
 2015-10-26 14:12:14 -07:00
Greg Neagle
41de516720 PyLint cleanup 2015-10-23 10:10:26 -07:00
Greg Neagle
cc794c9c39 Merge pull request #532 from munki/samuel-munkiimport 
Don't offer to create icons for profiles or Apple metadata
 2015-10-23 10:05:47 -07:00
Graham Gilbert
15d34fa5a5 Spelling is hard 2015-10-23 17:04:05 +00:00
Samuel Keeley
e0f771ceda Don't offer to create icons for profiles or Apple metadata 2015-10-23 10:02:47 -07:00
Shea Craig
ae9cd75dc9 Add mobileconfig to the usage of munkiimport. 2015-10-23 11:32:31 -04:00
Graham Gilbert
effe971249 Preference to Follow HTTP Recirects 2015-10-23 10:33:20 +01:00
Greg Neagle
f3904760cd In El Capitan, avoid changing the softwareupdate CatalogURL unless it's set in Munki's preferences. 2015-10-22 09:01:39 -07:00
Greg Neagle
422504e639 Merge branch 'master' of https://github.com/munki/munki 2015-10-14 14:14:29 -07:00
Greg Neagle
69c6398c6e Filter out _mbsetupuser when checking for GUI users at install time. Fix is similar to 0f8a51f9e7, which was for Managed Software Center.app 2015-10-14 14:14:17 -07:00
Nate Walck
b7a361d285 Added LocalOnlyManifest 2015-10-14 11:39:11 -07:00
Justin McWilliams
52009ae9df Edit Fix string concatenation of "No %s in item info" MunkiDownloadError 2015-10-12 12:06:19 -04:00
Justin McWilliams
2e34939a9a Fix string concatenation of MunkiDownloadError("Insufficient disk space to download and install %s") 2015-10-09 17:09:23 -04:00
Greg Neagle
087bed6b72 PyLint cleanups for managedsoftwareupdate 2015-10-09 08:59:26 -07:00
Greg Neagle
3fd17e5587 Rephrase logging about skipping Apple updates when Munki items to install contain Apple items; move code block to clearer place 2015-10-09 07:12:10 -07:00
Pepijn Bruienne
f3e86d2087 Add logging about skipped ASU checks when installing Apple items. 2015-10-09 09:40:09 -04:00
Greg Neagle
b2913d6d7c Bump main version number to 2.3.1 in prep for new release 2015-09-15 13:52:33 -07:00
eholtam
a663844ccf Update manifestutil find() output verbiage 
Changed "items" to "matches" to better reflect what 'find' finds.
 2015-09-01 11:01:31 -05:00
eholtam
5e9978f711 Remove find() breaks 
Removing the breaks in the find function to allow multiple matches per section per manifest.
Addresses issue https://github.com/munki/munki/issues/512
 2015-09-01 10:24:14 -05:00
Greg Neagle
c2239c5de8 Merge pull request #507 from erikng/master 
preupgrade_alert support
 2015-08-19 09:58:48 -07:00
Greg Neagle
891d70c778 Fix help message for managedsoftwareupdate --id 2015-08-19 09:46:04 -07:00