Commit Graph

2241 Commits

Author SHA1 Message Date
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
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
Joey Hess 5a932c382d docuemnt info propigtion problem 2014-12-07 16:37:02 -04:00
Joey Hess f692e1ceb2 Merge branch 'joeyconfig' 2014-12-07 15:34:33 -04:00
Joey Hess d7d833b431 fix cron example 2014-12-07 15:34:29 -04:00
Joey Hess 0972b3ca2e old news 2014-12-07 15:29:30 -04:00
Joey Hess 41d5a6b708 add news item for propellor 1.1.0 2014-12-07 15:25:56 -04:00
Joey Hess abee353d9d Merge branch 'joeyconfig' 2014-12-07 15:24:21 -04:00
Joey Hess f9958e1611 prep release 2014-12-07 15:24:07 -04:00
Joey Hess 2fe0b28982 more uses for hostContext 2014-12-07 15:21:55 -04:00
Joey Hess 3b0b6f44dd improve 2014-12-07 15:20:50 -04:00
Joey Hess 089b7131a6 caution 2014-12-07 15:13:28 -04:00
Joey Hess d1cfcc416c fix display 2 2014-12-07 15:11:43 -04:00
Joey Hess 5bb761bcf1 fix comment display 2014-12-07 15:10:55 -04:00
Joey Hess 4051c8c6ae update 2014-12-07 15:08:17 -04:00
Joey Hess faf4c21ca1 Merge branch 'joeyconfig' 2014-12-07 15:07:03 -04:00
Joey Hess 9ca332e481 Fixed privdata introspection for User.hasPassword and User.hasSomePassword
This is not a complete fix for the problem that Info doen't propigate
from the called property when code does something like:

	do
		hostname <- asks hostName
		ensureProperty $ foo hostname

Instead, I just eliminated the need to implement hasPassword that way,
by making the PrivData Info use a HostContext which automatically
gets the right hostname passed to it.

All other uses of withPrivData don't have the problem. It's still possible
for the user to run into the problem if they write something like the
above, where foo is a property that uses privdata. However, all properties
that take a Context now also accept a HostContext, so it's at least less
likely the user needs to write that.
2014-12-07 15:03:06 -04:00
Joey Hess 8c12047b6b simplify using makeChange 2014-12-07 14:49:12 -04:00
Joey Hess 6a906c8a4c typo 2014-12-07 12:50:40 -04:00