Commit Graph

393 Commits

Author SHA1 Message Date
Joey Hess 3d25c25171 Merge branch 'joeyconfig' 2014-04-17 20:11:23 -04:00
Joey Hess a19293732d prep release 2014-04-17 20:09:14 -04:00
Joey Hess 71b61ff9f3 use config.simple and allow building debian packages
This commit should not be merged into the config-joey branch.
2014-04-17 20:06:04 -04:00
Joey Hess d934c95b96 add back prevention from building debian package from joeyconfig branch 2014-04-17 20:05:21 -04:00
Joey Hess e1b96860bf cron locking 2014-04-17 19:43:12 -04:00
Joey Hess ba058d77a7 Merge branch 'joeyconfig' 2014-04-15 15:08:40 -04:00
Joey Hess baab388a98 update 2014-04-14 15:48:52 -04:00
Joey Hess 18d33cd391 Merge branch 'joeyconfig' 2014-04-14 02:24:55 -04:00
Joey Hess 2c1397c5b0 Standard apt configuration for stable now includes backports. 2014-04-13 15:54:25 -04:00
Joey Hess 95ac5163da Properties can now be satisfied differently on different operating systems. 2014-04-13 15:34:01 -04:00
Joey Hess 1495db6cd1
propellor spin 2014-04-13 14:01:30 -04:00
Joey Hess c7830f4e66
propellor spin 2014-04-12 22:36:36 -04:00
Joey Hess 9e9d0f1d41 Merge branch 'joeyconfig' 2014-04-12 14:14:20 -04:00
Joey Hess 99ec97db85 Merge scheduler bug fix from git-annex. 2014-04-11 15:00:27 -04:00
Joey Hess 61ed9ef26c Merge branch 'joeyconfig' 2014-04-11 01:19:22 -04:00
Joey Hess a342e216bb release 2014-04-11 01:19:15 -04:00
Joey Hess 856ce97995 Merge branch 'joeyconfig' 2014-04-11 01:09:01 -04:00
Joey Hess df9791ee26 deps 2014-04-10 17:50:16 -04:00
Joey Hess 25942fb0cc Propellor monad is a Reader for HostAttr
So far, the hostname is only used to improve a message in withPrivData,
but I anticipate using HostAttr for a lot more.
2014-04-10 17:23:43 -04:00
Joey Hess 13a4d4889c Use ssh connection caching, especially when bootstrapping. 2014-04-10 16:03:49 -04:00
Joey Hess 8852887907
propellor spin 2014-04-10 00:53:12 -04:00
Joey Hess 064cdd8fc5
propellor spin 2014-04-09 00:54:27 -04:00
Joey Hess 39f3acd6e4
propellor spin 2014-04-08 18:41:30 -04:00
Joey Hess 53eb3b9b1f ipv6to4: Ensure interface is brought up automatically on boot. 2014-04-08 18:08:16 -04:00
Joey Hess 07a071ac7f Merge branch 'joeyconfig' 2014-04-08 02:08:33 -04:00
Joey Hess 2e6f7c1b5d prep release 2014-04-08 02:08:28 -04:00
Joey Hess 634cf61c79 Merge branch 'joeyconfig'
Conflicts:
	Propellor/Property/Docker.hs
2014-04-08 02:07:11 -04:00
Joey Hess 17d46c67fa docker: When running as effective init inside container, wait on zombies. 2014-04-04 18:21:54 -04:00
Joey Hess da3976b9e2
propellor spin 2014-04-04 16:20:20 -04:00
Joey Hess 075a8eac5b
propellor spin 2014-04-04 15:58:48 -04:00
Joey Hess 8bb175d107 Merge branch 'joeyconfig'
Conflicts:
	config.hs
2014-04-04 01:12:44 -04:00
Joey Hess ccc8290712 update 2014-04-04 01:12:09 -04:00
Joey Hess cf3fc9b8e9 fix file mode bug 2014-04-04 00:08:30 -04:00
Joey Hess d779159e73 add x back 2014-04-03 12:15:45 -04:00
Joey Hess d3bc9be96c Revert "ok, so dpkg-buildpackage adds +x.. new method"
This reverts commit 1bfa12b688.
2014-04-03 12:15:28 -04:00
Joey Hess 1bfa12b688 ok, so dpkg-buildpackage adds +x.. new method 2014-04-03 12:15:06 -04:00
Joey Hess 52e185f864 remove -x from debian/rules, so I don't addicentially build a package from this branch 2014-04-03 12:13:23 -04:00
Joey Hess 42f207232b debianization and a wrapper program for /usr/bin 2014-04-03 01:55:49 -04:00
Joey Hess feaafc26de
propellor spin 2014-04-02 23:32:09 -04:00
Joey Hess 0297a11eaa prep release 2014-04-02 13:57:50 -04:00
Joey Hess 526bcbf093 type-safe reversions 2014-04-02 13:18:08 -04:00
Joey Hess 2193b853b6 add 2014-04-01 15:28:55 -04:00
Joey Hess b6eba67f78 changelog 2014-04-01 15:07:07 -04:00