Commit Graph

2258 Commits

Author SHA1 Message Date
Joey Hess 6d56dbd35a Merge branch 'joeyconfig' 2014-12-21 21:40:26 -04:00
Joey Hess dc36a98fc1 Revert ensureProperty warning message, too many false positives in places where Info is correctly propigated. Better approach needed. 2014-12-21 21:33:03 -04:00
Joey Hess 7f35024ef2
propellor spin 2014-12-21 21:28:22 -04:00
Joey Hess 69b546400c
propellor spin 2014-12-21 21:23:07 -04:00
Joey Hess d194765e10
propellor spin 2014-12-21 21:14:11 -04:00
Joey Hess 9444326c87
propellor spin 2014-12-21 21:05:12 -04:00
Joey Hess d38017a1ab
propellor spin 2014-12-21 21:01:46 -04:00
Joey Hess a68bd830ac add news item for propellor 1.2.1 2014-12-17 16:34:15 -04:00
Joey Hess 8cc691dc86 Merge branch 'joeyconfig'
Conflicts:
	privdata.joey/privdata.gpg
2014-12-17 16:31:09 -04:00
Joey Hess ddeee3ceb8 prep release 2014-12-17 16:30:54 -04:00
Joey Hess 8588629034 comment 2014-12-15 12:05:06 -04:00
Joey Hess db3f9050d6 comment 2014-12-15 12:00:16 -04:00
Joey Hess a4307f85a5 Merge branch 'master' of ssh://propellor.branchable.com 2014-12-15 11:44:55 -04:00
Joey Hess 68714dfd31
propellor spin 2014-12-14 16:15:24 -04:00
Joey Hess 333e83a032
propellor spin 2014-12-14 16:15:10 -04:00
Joey Hess 23399416f1 broke up big function to describe PrivDataField 2014-12-14 16:14:05 -04:00
Joey Hess fbf9cc6f2b Merge branch 'joeyconfig' 2014-12-14 15:24:21 -04:00
Joey Hess 71723ca09f support for crypted passwords in privdata
* Added CryptPassword to PrivDataField, for password hashes as produced
  by crypt(3).
* User.hasPassword and User.hasSomePassword will now use either
  a CryptPassword or a Password from privdata, depending on which is set.
2014-12-14 15:24:10 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkgUir7k_amh9RFp4D3QutX1fGh_nd7ko4 c164e48096 Added a comment: Passwords in PrivData 2014-12-13 18:25:23 +00:00
Joey Hess 9d06d2f835 Merge branch 'joeyconfig' 2014-12-09 14:22:42 -04:00
Joey Hess 2e2438ae66 improve haddock formating of filenames 2014-12-09 14:22:37 -04:00
Joey Hess 36eec4e2ea Merge branch 'joeyconfig' 2014-12-09 00:39:53 -04:00
Joey Hess 3c48f6ac93 remove propelor.1 from the cabal file
This file is now generated by building the package.
2014-12-09 00:39:28 -04:00
Joey Hess 7a71cc0455 add news item for propellor 1.2.0 2014-12-09 00:38:51 -04:00
Joey Hess 173d7485c0 comment 2014-12-09 00:36:46 -04:00
Joey Hess 4f309c5cd6 Merge branch 'joeyconfig' 2014-12-09 00:34:57 -04:00
Joey Hess b22201e36b Fix Apache.siteEnabled to update the config file and reload apache when configuration has changed. 2014-12-09 00:34:24 -04:00
Joey Hess f8943c2036 fix a case where fileProperty reported a change despite not making one
The problem occurred because two lists of lines of the file can be
different, while representing the same file content. For example:
["foo", "bar"]
["foo\nbar"]
2014-12-09 00:30:04 -04:00
Joey Hess 914f762d01 Merge branch 'master' of ssh://propellor.branchable.com 2014-12-09 00:05:47 -04:00
Joey Hess 5752080929 Merge branch 'joeyconfig' 2014-12-09 00:05:34 -04:00
Joey Hess 040a5fe3c7 prep release 2014-12-09 00:05:16 -04:00
Joey Hess 99bff87440 Include Propellor.Property.OS, which was accidentially left out of the cabal file in the last release. 2014-12-09 00:03:14 -04:00
picca cc1ec7e2e2 Added a comment 2014-12-08 10:47:59 +00:00
Pierre Fersing 9884b18dcd propellor spin 2014-12-08 10:52:50 +01:00
picca 51493f7558 Added a comment: second run with content modified 2014-12-08 09:37:43 +00:00
picca 9ac0dfb246 Added a comment: first run 2014-12-08 09:31:46 +00:00
picca c5a8caeb53 formating 2014-12-08 09:18:16 +00:00
picca 64ea1b7930 2014-12-08 08:59:32 +00:00
Joey Hess 834a05e25a refactor 2014-12-08 01:22:29 -04:00
Joey Hess 06975ec5e1 another place to use toResult 2014-12-08 01:12:55 -04:00
Joey Hess 6b6d5a0881 changelog 2014-12-08 01:08:40 -04:00
Joey Hess 9841594c85 Merge branch 'joeyconfig' 2014-12-08 01:07:44 -04:00
Joey Hess 3c7219874b finished accidentially committed bit 2014-12-08 01:07:31 -04:00
Joey Hess 4e9b01a8a7 propellor spin
(cherry picked from commit 1d02d589c7)
2014-12-08 01:07:25 -04:00
Joey Hess 1d02d589c7 propellor spin 2014-12-08 01:06:19 -04:00
Joey Hess 27d00296ec update 2014-12-07 21:52:14 -04:00
Joey Hess ac0bedb90b update 2014-12-07 19:20:02 -04:00
Joey Hess 21d87341ca Merge branch 'joeyconfig' 2014-12-07 18:49:43 -04:00
Joey Hess 19a1d6b7ed expand 2014-12-07 18:49:42 -04:00
Joey Hess 42a0c83248 Display a warning when ensureProperty is used on a property which has Info and is so prevented from propigating it.
Would much rather a type-based fixed, but this is all I have for now.
2014-12-07 17:09:55 -04:00