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
Joey Hess