da8411c1f1
Merge branch 'joeyconfig'
2014-11-18 21:26:30 -04:00
e273946c22
reword
2014-11-18 21:20:56 -04:00
6df64ff653
Merge branch 'joeyconfig'
2014-11-18 17:33:21 -04:00
74e067fa76
propellor spin
2014-11-18 17:26:02 -04:00
a0ea904ecb
changelog for last commit's changes
2014-11-18 14:01:13 -04:00
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
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
2fab1a08b4
Merge branch 'joeyconfig'
2014-11-17 17:02:47 -04:00
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
8d91b5de6b
Convert GpgKeyId to newtype
2014-11-15 17:02:30 -04:00
7902f705b0
update email
2014-11-15 15:03:54 -04:00
08ff95fbfa
Merge branch 'joeyconfig'
2014-11-11 13:47:25 -04:00
be27ae1503
changelog
2014-11-11 13:00:33 -04:00
3145346fb8
Merge branch 'joeyconfig'
2014-11-10 16:22:49 -04:00
929d26d556
changelog
2014-11-10 16:22:44 -04:00
e0a47a59d9
Merge branch 'joeyconfig'
2014-11-10 11:15:47 -04:00
9608a390d2
Added prosody module, contributed by Félix Sipma.
2014-11-10 11:15:41 -04:00
de50503e4d
Merge branch 'joeyconfig'
2014-11-08 15:57:56 -04:00
f3a31c9192
prep release
2014-11-08 15:57:46 -04:00
1187cd4901
Orphaned the Debian package, as I am retiring from Debian.
2014-11-08 15:57:33 -04:00
f38cd7c6a5
Merge branch 'joeyconfig'
2014-11-08 15:56:36 -04:00
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
8526291789
Merge branch 'joeyconfig'
2014-10-31 17:57:17 -04:00
ef9abb9b67
Apache: Fix daemon reload when enabling a new module or site.
2014-10-31 17:47:52 -04:00
43935ae7b0
Merge branch 'joeyconfig'
...
Conflicts:
privdata/privdata.gpg
2014-10-31 10:21:37 -04:00
ca06c64bae
changelog
2014-10-31 10:21:27 -04:00
01509b040e
changelog
2014-10-30 16:36:37 -04:00
c4533b38e3
Merge branch 'joeyconfig'
2014-10-24 10:02:09 -04:00
bbf258a075
update home page
2014-10-24 10:01:55 -04:00
3959d5be90
Merge branch 'joeyconfig'
2014-10-24 09:58:12 -04:00
b5ab8a7f9f
prep release
2014-10-24 09:57:52 -04:00
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
bdf3e37066
Revert "propellor spin"
...
This reverts commit 80f5b53f1b
2014-10-23 11:33:00 -04:00
80f5b53f1b
propellor spin
2014-10-23 11:26:05 -04:00
5bfeb3f9aa
Revert "propellor spin"
...
This reverts commit 7637ea0af9
2014-10-23 11:25:07 -04:00
7637ea0af9
propellor spin
2014-10-23 11:23:25 -04:00
856a4c673c
propellor spin
2014-10-23 03:27:40 -04:00
93099b8627
bugfix
2014-10-23 03:18:52 -04:00
adbc70b768
Merge branch 'joeyconfig'
2014-10-10 14:25:47 -04:00
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
cc0ee8d48d
Merge branch 'joeyconfig'
2014-10-10 11:38:00 -04:00
e7d8cbac1b
finalize release
2014-10-10 11:37:50 -04:00
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
07f745ef9c
Merge branch 'joeyconfig'
...
Conflicts:
debian/changelog
privdata/privdata.gpg
2014-10-10 11:36:47 -04:00
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
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
a67beb7118
Merge branch 'joeyconfig'
2014-08-22 13:02:21 -04:00
7ff8d0f8a2
prep release
2014-08-22 13:02:18 -04:00
94b7c9d298
Merge branch 'joeyconfig'
2014-08-19 19:06:30 -04:00
81544b37a8
fix man page installation
2014-08-19 19:06:21 -04:00
0ad5b6e410
Merge branch 'joeyconfig'
2014-08-19 19:03:29 -04:00
11c1160655
reorg manpage
2014-08-19 18:06:00 -04:00
b938dbbe3c
Merge branch 'joeyconfig'
2014-08-19 17:00:56 -04:00
371f6077fd
prep release
2014-08-19 17:00:49 -04:00
16c01b24ce
Merge branch 'joeyconfig'
2014-08-19 16:40:31 -04:00
3c61c109fb
ugly workaround for lack of history in repo distributed with debian package
2014-08-19 16:40:04 -04:00
77f79fa032
Merge branch 'joeyconfig'
2014-08-19 15:22:48 -04:00
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
21897c955e
Merge branch 'joeyconfig'
2014-08-19 15:03:11 -04:00
7d59dee469
local repo fully working now
2014-08-19 15:02:12 -04:00
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
ebeb3cb8fa
Merge branch 'joeyconfig'
2014-08-19 14:34:16 -04:00
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
c3c1f921bb
upgrade note
2014-08-19 14:17:04 -04:00
1ed98cc755
Included the config.hs symlink to config-simple.hs in the cabal and Debian packages.
2014-08-19 14:16:53 -04:00
81f370b9da
Merge branch 'joeyconfig'
2014-08-04 01:12:39 -04:00
9d2cc7774b
prep release
2014-08-04 01:12:34 -04:00
02d7e6d5c6
changelog
2014-07-23 12:43:30 -04:00
98a3114763
propellor spin
2014-07-22 15:25:07 -04:00
0f3faffd36
changelog
2014-07-18 13:12:28 -04:00
5c3b069f23
changelog
2014-07-18 12:49:36 -04:00
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
0c5e16184f
Merge branch 'joeyconfig'
2014-07-09 22:12:23 -04:00
54d2888a96
Remove .gitignore from cabal file list, to avoid build failure on Debian. Closes : #754334
2014-07-09 22:11:40 -04:00
e53faff843
propellor spin
2014-07-07 03:42:35 -04:00
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
88999f8455
Merge branch 'joeyconfig'
2014-07-06 18:28:48 -04:00
5576955ec5
prep release
2014-07-06 18:28:19 -04:00
ab5159626d
twea
2014-07-06 18:28:05 -04:00
1ea184b76a
twea
2014-07-06 18:27:44 -04:00
40d559fbbe
Merge branch 'joeyconfig'
2014-07-06 18:23:54 -04:00
3db1ca1194
wording
2014-07-06 18:09:53 -04:00
2fde19656e
wording
2014-07-06 17:25:07 -04:00
5002b5e391
propellor spin
2014-07-06 16:32:05 -04:00
58f79c12aa
propellor spin
2014-07-06 15:56:56 -04:00
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
d062e21a5e
propellor spin
2014-07-05 17:57:19 -04:00
f674c56119
Add --list-fields to list a host's currently set privdata fields.
2014-06-19 14:56:50 -04:00
42594d6b4c
Add --edit to edit a privdata value in $EDITOR
2014-06-19 14:48:15 -04:00
9e35d6b564
Merge branch 'joeyconfig'
2014-06-13 10:06:52 -04:00
b6fc95602d
prep release
2014-06-13 10:06:42 -04:00
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
cc9aa510c9
Merge branch 'joeyconfig'
2014-06-10 01:15:30 -04:00
c8c96a6908
changelog
2014-06-09 12:34:52 -04:00
70ab611efd
Merge branch 'joeyconfig'
2014-06-09 12:32:15 -04:00
fc49d75e4f
Attr is renamed to Info.
2014-06-09 01:47:11 -04:00
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
48b8d1c185
Merge branch 'joeyconfig'
2014-06-05 17:35:36 -04:00
2db48021f0
typo
2014-06-05 17:35:29 -04:00
f4f43fc935
Merge branch 'joeyconfig'
2014-06-05 17:32:32 -04:00
Joey Hess