cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,113 Commits 1 Branch 0 Tags 6.6 MiB
Commit Graph

393 Commits

Author SHA1 Message Date
Joey Hess 409e20a69e big 1.0 2014-11-19 01:41:50 -04:00
Joey Hess c3962dcf7d
propellor spin 2014-11-19 01:04:11 -04:00
Joey Hess da8411c1f1 Merge branch 'joeyconfig' 2014-11-18 21:26:30 -04:00
Joey Hess e273946c22 reword 2014-11-18 21:20:56 -04:00
Joey Hess 6df64ff653 Merge branch 'joeyconfig' 2014-11-18 17:33:21 -04:00
Joey Hess 74e067fa76
propellor spin 2014-11-18 17:26:02 -04:00
Joey Hess a0ea904ecb changelog for last commit's changes 2014-11-18 14:01:13 -04:00
Joey Hess 40f6d06f1a Run remote propellor --spin with a controlling terminal. 
Avoids need for hack to make ansi colors work, but also things like apt-get
and wget process bars will be displayed.
 2014-11-18 01:01:50 -04:00
Joey Hess 82d50a5796 Avoid outputting color setting sequences when not run on a terminal. 
Currently TERM is checked for every message. Could be memoized, but it
would add complexity, and typical propellor output is not going to be more
than a few hundred messages, and likely this will be swamped by the actual
work.
 2014-11-18 00:19:11 -04:00
Joey Hess 2fab1a08b4 Merge branch 'joeyconfig' 2014-11-17 17:02:47 -04:00
Joey Hess 46cd2ad0e0 DigitalOcean.distroKernel property now reboots into the distribution kernel when necessary. 
It might be better to do this check on boot to limit the time running the
DO kernel (which is not well security supported), but that has the
possibility of entering a bad reboot loop. Limiting this check to when
propellor runs avoids that, while still fixing the problem pretty fast.
 2014-11-17 16:42:15 -04:00
Joey Hess 8d91b5de6b Convert GpgKeyId to newtype 2014-11-15 17:02:30 -04:00
Joey Hess 7902f705b0 update email 2014-11-15 15:03:54 -04:00
Joey Hess 08ff95fbfa Merge branch 'joeyconfig' 2014-11-11 13:47:25 -04:00
Joey Hess be27ae1503 changelog 2014-11-11 13:00:33 -04:00
Joey Hess 3145346fb8 Merge branch 'joeyconfig' 2014-11-10 16:22:49 -04:00
Joey Hess 929d26d556 changelog 2014-11-10 16:22:44 -04:00
Joey Hess e0a47a59d9 Merge branch 'joeyconfig' 2014-11-10 11:15:47 -04:00
Joey Hess 9608a390d2 Added prosody module, contributed by Félix Sipma. 2014-11-10 11:15:41 -04:00
Joey Hess de50503e4d Merge branch 'joeyconfig' 2014-11-08 15:57:56 -04:00
Joey Hess f3a31c9192 prep release 2014-11-08 15:57:46 -04:00
Joey Hess 1187cd4901 Orphaned the Debian package, as I am retiring from Debian. 2014-11-08 15:57:33 -04:00
Joey Hess f38cd7c6a5 Merge branch 'joeyconfig' 2014-11-08 15:56:36 -04:00
Joey Hess 9755b761bb Docker: Stop using docker.io; that was a compat symlink in the Debian package which has been removed in docker.io 1.3.1~dfsg1-2. 2014-11-08 15:55:58 -04:00
Joey Hess 8526291789 Merge branch 'joeyconfig' 2014-10-31 17:57:17 -04:00
Joey Hess ef9abb9b67 Apache: Fix daemon reload when enabling a new module or site. 2014-10-31 17:47:52 -04:00
Joey Hess 43935ae7b0 Merge branch 'joeyconfig' 
Conflicts:
	privdata/privdata.gpg
 2014-10-31 10:21:37 -04:00
Joey Hess ca06c64bae changelog 2014-10-31 10:21:27 -04:00
Joey Hess 01509b040e changelog 2014-10-30 16:36:37 -04:00
Joey Hess c4533b38e3 Merge branch 'joeyconfig' 2014-10-24 10:02:09 -04:00
Joey Hess bbf258a075 update home page 2014-10-24 10:01:55 -04:00
Joey Hess 3959d5be90 Merge branch 'joeyconfig' 2014-10-24 09:58:12 -04:00
Joey Hess b5ab8a7f9f prep release 2014-10-24 09:57:52 -04:00
Joey Hess 73a75cbefc Fix loop when a docker host that does not exist was docked. 
The problem is it fell back to looking for an alias for the bad hostname,
but to get the aliases, it needs to know which hosts are docked where,
so looped.
 2014-10-23 12:11:43 -04:00
Joey Hess bdf3e37066 Revert "propellor spin" 
This reverts commit 80f5b53f1b.
 2014-10-23 11:33:00 -04:00
Joey Hess 80f5b53f1b
propellor spin 2014-10-23 11:26:05 -04:00
Joey Hess 5bfeb3f9aa Revert "propellor spin" 
This reverts commit 7637ea0af9.
 2014-10-23 11:25:07 -04:00
Joey Hess 7637ea0af9
propellor spin 2014-10-23 11:23:25 -04:00
Joey Hess 856a4c673c
propellor spin 2014-10-23 03:27:40 -04:00
Joey Hess 93099b8627 bugfix 2014-10-23 03:18:52 -04:00
Joey Hess adbc70b768 Merge branch 'joeyconfig' 2014-10-10 14:25:47 -04:00
Joey Hess df0c0e56cb Docker: Avoid committing container every time it's started up. 
This was using a lot of disk space. Instead, start the container, and then
use the running container to check if docker is running it with the right
params. In the unlikely case that the params have changed, we still need to
commit the container and restart it. The common case of eg a reboot no
longer commits though.
 2014-10-10 13:47:41 -04:00
Joey Hess cc0ee8d48d Merge branch 'joeyconfig' 2014-10-10 11:38:00 -04:00
Joey Hess e7d8cbac1b finalize release 2014-10-10 11:37:50 -04:00
Joey Hess 7f17765de3 debCdn switched from cdn.debian.net to http.debian.net, which seems to be better managed now. 
Conflicts:
	debian/changelog
 2014-10-10 11:37:22 -04:00
Joey Hess 07f745ef9c Merge branch 'joeyconfig' 
Conflicts:
	debian/changelog
	privdata/privdata.gpg
 2014-10-10 11:36:47 -04:00
Joey Hess 79ee61d958 stable suite changes 
* Avoid encoding the current stable suite in propellor's code,
  since that poses a difficult transition around the release,
  and can easily be wrong if an older version of propellor is used.
  Instead, the os property for a stable system includes the suite name
  to use, eg Stable "wheezy".
* stdSourcesList uses the stable suite name, to avoid unwanted
  immediate upgrades to the next stable release.
 2014-10-10 11:27:54 -04:00
Joey Hess 4f92a77e82 debCdn switched from cdn.debian.net to http.debian.net, which seems to be better managed now. 2014-08-23 13:19:27 -07:00
Joey Hess a67beb7118 Merge branch 'joeyconfig' 2014-08-22 13:02:21 -04:00
Joey Hess 7ff8d0f8a2 prep release 2014-08-22 13:02:18 -04:00
Joey Hess 94b7c9d298 Merge branch 'joeyconfig' 2014-08-19 19:06:30 -04:00
Joey Hess 81544b37a8 fix man page installation 2014-08-19 19:06:21 -04:00
Joey Hess 0ad5b6e410 Merge branch 'joeyconfig' 2014-08-19 19:03:29 -04:00
Joey Hess 11c1160655 reorg manpage 2014-08-19 18:06:00 -04:00
Joey Hess b938dbbe3c Merge branch 'joeyconfig' 2014-08-19 17:00:56 -04:00
Joey Hess 371f6077fd prep release 2014-08-19 17:00:49 -04:00
Joey Hess 16c01b24ce Merge branch 'joeyconfig' 2014-08-19 16:40:31 -04:00
Joey Hess 3c61c109fb ugly workaround for lack of history in repo distributed with debian package 2014-08-19 16:40:04 -04:00
Joey Hess 77f79fa032 Merge branch 'joeyconfig' 2014-08-19 15:22:48 -04:00
Joey Hess 1830f501ee debian upgrade handling 
The /usr/bin/propellor wrapper will warn when ~/.propellor/ is out of date
and a newer version is available from origin.
 2014-08-19 15:22:42 -04:00
Joey Hess 21897c955e Merge branch 'joeyconfig' 2014-08-19 15:03:11 -04:00
Joey Hess 7d59dee469 local repo fully working now 2014-08-19 15:02:12 -04:00
Joey Hess b6c5f54741 The Debian package now includes a single-revision git repository in /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package. 2014-08-19 14:35:38 -04:00
Joey Hess ebeb3cb8fa Merge branch 'joeyconfig' 2014-08-19 14:34:16 -04:00
Joey Hess e6f13a9af9 The Debian package now includes a single-revision git repository in /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package. 2014-08-19 14:33:43 -04:00
Joey Hess c3c1f921bb upgrade note 2014-08-19 14:17:04 -04:00
Joey Hess 1ed98cc755 Included the config.hs symlink to config-simple.hs in the cabal and Debian packages. 2014-08-19 14:16:53 -04:00
Joey Hess 81f370b9da Merge branch 'joeyconfig' 2014-08-04 01:12:39 -04:00
Joey Hess 9d2cc7774b prep release 2014-08-04 01:12:34 -04:00
Joey Hess 02d7e6d5c6 changelog 2014-07-23 12:43:30 -04:00
Joey Hess 98a3114763
propellor spin 2014-07-22 15:25:07 -04:00
Joey Hess 0f3faffd36 changelog 2014-07-18 13:12:28 -04:00
Joey Hess 5c3b069f23 changelog 2014-07-18 12:49:36 -04:00
Joey Hess 55a638ad4c Fix bug in File.containsLines that caused lines that were already in the file to sometimes be appended to the end. 2014-07-17 23:33:10 -04:00
Joey Hess 0c5e16184f Merge branch 'joeyconfig' 2014-07-09 22:12:23 -04:00
Joey Hess 54d2888a96 Remove .gitignore from cabal file list, to avoid build failure on Debian. Closes: #754334 2014-07-09 22:11:40 -04:00
Joey Hess e53faff843
propellor spin 2014-07-07 03:42:35 -04:00
Joey Hess 8f46b7ab68 Run apt-get update in initial bootstrap. 
For eg, Linode, which brings up hosts that have not updated at all so
apt-get install doesn't work.
 2014-07-07 02:04:21 -04:00
Joey Hess 88999f8455 Merge branch 'joeyconfig' 2014-07-06 18:28:48 -04:00
Joey Hess 5576955ec5 prep release 2014-07-06 18:28:19 -04:00
Joey Hess ab5159626d twea 2014-07-06 18:28:05 -04:00
Joey Hess 1ea184b76a twea 2014-07-06 18:27:44 -04:00
Joey Hess 40d559fbbe Merge branch 'joeyconfig' 2014-07-06 18:23:54 -04:00
Joey Hess 3db1ca1194 wording 2014-07-06 18:09:53 -04:00
Joey Hess 2fde19656e wording 2014-07-06 17:25:07 -04:00
Joey Hess 5002b5e391
propellor spin 2014-07-06 16:32:05 -04:00
Joey Hess 58f79c12aa
propellor spin 2014-07-06 15:56:56 -04:00
Joey Hess 26f989b5ab Hostname.sane now cleans up the 127.0.0.1 localhost line in /etc/hosts, to avoid eg, apache complaining that "Could not reliably determine the server's fully qualified domain name". 2014-07-06 12:23:57 -04:00
Joey Hess d062e21a5e
propellor spin 2014-07-05 17:57:19 -04:00
Joey Hess f674c56119 Add --list-fields to list a host's currently set privdata fields. 2014-06-19 14:56:50 -04:00
Joey Hess 42594d6b4c Add --edit to edit a privdata value in $EDITOR 2014-06-19 14:48:15 -04:00
Joey Hess 9e35d6b564 Merge branch 'joeyconfig' 2014-06-13 10:06:52 -04:00
Joey Hess b6fc95602d prep release 2014-06-13 10:06:42 -04:00
Joey Hess dd554e20b9 When git gpg signature of a fetched git branch cannot be verified, propellor will now continue running, but without merging in that branch. 
This way, propellor doesn't stop enforcing properties just because its new
configuration isn't ready. It just uses the old configuration.
 2014-06-10 15:49:17 -04:00
Joey Hess cc9aa510c9 Merge branch 'joeyconfig' 2014-06-10 01:15:30 -04:00
Joey Hess c8c96a6908 changelog 2014-06-09 12:34:52 -04:00
Joey Hess 70ab611efd Merge branch 'joeyconfig' 2014-06-09 12:32:15 -04:00
Joey Hess fc49d75e4f Attr is renamed to Info. 2014-06-09 01:47:11 -04:00
Joey Hess 582be8ebe0 combineProperties no longer stops when a property fails; now it continues trying to satisfy all properties on the list before propigating the failure. 
Audited all of my calls to combineProperties and they should be fine with
this behavior.. which suggests it's the right behavior.
 2014-06-07 00:14:05 -04:00
Joey Hess 48b8d1c185 Merge branch 'joeyconfig' 2014-06-05 17:35:36 -04:00
Joey Hess 2db48021f0 typo 2014-06-05 17:35:29 -04:00
Joey Hess f4f43fc935 Merge branch 'joeyconfig' 2014-06-05 17:32:32 -04:00
Joey Hess 0ba3e77f84 finalize release 2014-06-05 17:32:16 -04:00
Joey Hess 4fdd1b9ea4 Merge branch 'joeyconfig' 2014-06-05 17:21:57 -04:00
Joey Hess c2dd54d167 prep release 2014-06-05 17:21:49 -04:00
Joey Hess 4ac314fb48 Apt.stdSourcesList no longer needs a suite to be specified. 2014-06-05 17:01:32 -04:00
Joey Hess f8bad27267 Merge branch 'joeyconfig' 2014-06-05 16:52:45 -04:00
Joey Hess 740740d215 Added --dump to dump out a field of a host's privdata. Useful for editing it. 2014-06-01 16:58:05 -04:00
Joey Hess d224463dcd comment 2014-06-01 15:07:17 -04:00
Joey Hess 2588cab6a2 Merge branch 'joeyconfig' 2014-05-31 21:03:08 -04:00
Joey Hess 84eb050085 Propellor's output now includes the hostname being provisioned, or when provisioning a docker container, the container name. 2014-05-31 18:44:49 -04:00
Joey Hess 6383d8c388
propellor spin 2014-05-31 16:48:14 -04:00
Joey Hess ca21f8999c Merge branch 'joeyconfig' 2014-05-29 14:30:17 -04:00
Joey Hess 0e8c6e5fee prep release 2014-05-29 14:30:06 -04:00
Joey Hess 2b77ee8e10 Merge branch 'joeyconfig' 2014-05-29 14:29:34 -04:00
Joey Hess 0ec565a590
propellor spin 2014-05-23 12:30:25 -04:00
Joey Hess 8ab6799d48 Ensure that kernel hostname is same as /etc/hostname when configuring hostname. 2014-05-19 10:51:28 -04:00
Joey Hess 79bc355adc Merge branch 'joeyconfig' 2014-05-18 13:45:50 -04:00
Joey Hess 227effc1ad
Fix unattended-upgrades config for !stable. 2014-05-18 13:44:28 -04:00
Joey Hess d1d94fa1ea Merge branch 'joeyconfig' 2014-05-17 16:43:36 -04:00
Joey Hess c09babd5b7 prep release 2014-05-17 16:43:10 -04:00
Joey Hess 2081a49b65 changelog 2014-05-14 20:36:23 -04:00
Joey Hess eb6e6fe112 Merge branch 'joeyconfig' 2014-05-10 11:13:47 -03:00
Joey Hess 84efb9bdee Licence changed from GPL to BSD. 2014-05-10 11:08:30 -03:00
Joey Hess c4f364b249 Merge branch 'joeyconfig' 2014-04-24 18:10:23 -04:00
Joey Hess 72a6b1c759 prep release 2014-04-24 18:10:13 -04:00
Joey Hess e1ce4e2d05
propellor spin 2014-04-23 23:57:36 -04:00
Joey Hess 34c7a14060
propellor spin 2014-04-23 15:04:35 -04:00
Joey Hess 792957153c Merge branch 'joeyconfig' 2014-04-23 13:54:02 -04:00
Joey Hess 55f16b25a5 Add missing build deps and deps. Closes: #745459 2014-04-22 19:08:14 -04:00
Joey Hess 3c7fdfcfb1 Merge branch 'joeyconfig' 2014-04-19 17:38:23 -04:00
Joey Hess 66e492fa82 prep release 2014-04-19 17:38:15 -04:00
Joey Hess 9e6d894352 Revert "change joeyconfig back after merging from master" 
This reverts commit 5fd4e6a5cf.
 2014-04-19 16:18:11 -04:00
Joey Hess 5fd4e6a5cf change joeyconfig back after merging from master 2014-04-19 16:17:47 -04:00
Joey Hess 2cfb22a59b spit up TODO 2014-04-19 16:14:10 -04:00
Joey Hess 9a070e66ec add news feed 2014-04-19 15:56:19 -04:00
Joey Hess 494f5d3bef Merge branch 'joeyconfig' 2014-04-19 15:51:01 -04:00
Joey Hess 86e7e4e58e When unattendedUpgrades is enabled on an Unstable or Testing system, configure it to allow the upgrades. 2014-04-19 13:17:25 -04:00
Joey Hess 8c12c5b8ec Merge branch 'joeyconfig' 2014-04-19 11:42:31 -04:00
Joey Hess fffa3e003a Dns primary and secondary properties are now revertable. 2014-04-19 11:00:48 -04:00
Joey Hess 2279979d32 Removed root domain records from SOA. Instead, use RootDomain when calling Dns.primary. 2014-04-19 10:47:38 -04:00
Joey Hess 5dd316a0ad Merge branch 'joeyconfig' 2014-04-19 02:10:56 -04:00
Joey Hess 6aeeaaab90 prep release 2014-04-19 02:10:41 -04:00
Joey Hess 9e578aca6b rename aka to alias 2014-04-19 01:28:46 -04:00
Joey Hess d1db64b3bc Propellor can configure primary DNS servers, including generating zone files, which is done by looking at the properties of hosts in a domain. 2014-04-19 01:26:38 -04:00
Joey Hess 7e9853520b The `cname` property was renamed to `aka` as it does not always generate CNAME in the DNS. 2014-04-18 23:41:26 -04:00
Joey Hess 5f6c3ad564 All Property combinators now combine together their Attr settings. 
So Attr settings can be made inside a propertyList, for example.
 2014-04-18 04:48:49 -04:00
Joey Hess 4e4fb9ab7c get rid of AttrProperty 
Now both Property and RevertableProperty can influence Attr on their own.
 2014-04-18 03:59:06 -04:00
Joey Hess 27ff3e9f21 Merge branch 'joeyconfig' 2014-04-17 22:28:21 -04:00
Joey Hess 0485387aa0 Run all cron jobs under chronic from moreutils to avoid unnecessary mails. 2014-04-17 21:01:06 -04:00
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