Joey Hess
ddeee3ceb8
prep release
2014-12-17 16:30:54 -04:00
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
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
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
Joey Hess
6b6d5a0881
changelog
2014-12-08 01:08:40 -04:00
Joey Hess
21d87341ca
Merge branch 'joeyconfig'
2014-12-07 18:49:43 -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
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
3b0b6f44dd
improve
2014-12-07 15:20:50 -04:00
Joey Hess
089b7131a6
caution
2014-12-07 15:13:28 -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
322ae878bb
Merge branch 'joeyconfig'
...
Conflicts:
privdata.joey/privdata.gpg
2014-12-07 12:04:58 -04:00
Joey Hess
fcff7762e3
endAction can be used to register an action to run once propellor has successfully run on a host.
2014-12-06 06:34:32 -04:00
Joey Hess
9805f132ac
Merge branch 'joeyconfig'
2014-12-05 17:44:14 -04:00
Joey Hess
527975dffe
hasSomePassword and hasPassword now check to make sure shadow passwords are enabled.
2014-12-05 16:33:23 -04:00
Joey Hess
dbc76b1e52
Merge branch 'joeyconfig'
2014-12-05 16:23:07 -04:00
Joey Hess
bf9284d05c
I have now successfully used propellor to convert a Fedora system into a bootable and fully working Debian system
2014-12-05 16:22:11 -04:00
Joey Hess
573b8b7df8
changelog
2014-12-04 17:40:26 -04:00
Joey Hess
8b70031a78
Merge branch 'joeyconfig'
2014-12-01 11:59:38 -04:00
Joey Hess
c9d09afafa
Run apt-cache policy with LANG=C.
2014-12-01 11:59:27 -04:00
Joey Hess
3d42f1fa19
Merge branch 'joeyconfig'
2014-11-26 10:51:41 -04:00
Joey Hess
e07dc9b1d3
propellor.debug can be set in the git config to enable more persistent debugging output.
2014-11-25 18:55:12 -04:00
Joey Hess
1f40af51e1
Merge branch 'joeyconfig'
2014-11-25 11:46:36 -04:00
Joey Hess
40374c10de
cron.runPropellor now runs propellor, rather than using its Makefile. This is more robust.
...
Particularly, the Makefile would try to build propellor if there were
updates, but if this build failed because a bad commit was pushed, it would
abort w/o pulling any new fixed commits.
Anyway, it's better to move away from using the makefile when possible as
it's just for bootstrapping, and also I would like to make "make" not
default to running propellor as that can be confusing behavior.
(I can't change that yet; needed for upgrades. Should be fine to change
after several more releases, or maybe a year..)
2014-11-25 11:33:45 -04:00
Joey Hess
f14749c1cc
Merge branch 'joeyconfig'
2014-11-23 18:49:33 -04:00
Joey Hess
9d975e9ee4
add --merge
2014-11-23 18:48:52 -04:00
Joey Hess
95296a961c
Merge branch 'joeyconfig'
2014-11-23 17:13:02 -04:00
Joey Hess
baba668033
hasSomePassword and hasPassword now default to using the name of the host as the Context for the password. To specify a different context, use hasSomePassword' and hasPassword' (API change)
2014-11-23 16:40:21 -04:00
Joey Hess
45d943023d
Merge branch 'joeyconfig'
2014-11-23 15:23:54 -04:00
Joey Hess
0ea0f7f4de
--spin can be passed multiple hosts, and it will provision each host in turn.
...
Note that if it fails to spin a host, it will stop. I think this is better
than continuing to the next, because there might be a reason to spin hosts
in some specific order (ie, update dns first and then use it).
2014-11-23 15:17:57 -04:00
Joey Hess
ac41f8b07b
Merge branch 'joeyconfig'
2014-11-23 14:41:09 -04:00
Joey Hess
dea5c2068e
changelog
2014-11-23 14:39:19 -04:00
Joey Hess
e8a07b1840
changelog
2014-11-23 14:38:31 -04:00
Joey Hess
9a8fcf80bb
Hostname parameters not containing dots are looked up in the DNS to find the full hostname.
2014-11-22 19:58:35 -04:00
Joey Hess
d413818647
clarify
2014-11-22 16:26:03 -04:00
Joey Hess
fd3335e40e
--via implemented
2014-11-22 12:57:07 -04:00
Joey Hess
7cbf4841de
Merge branch 'joeyconfig'
2014-11-22 12:13:41 -04:00
Joey Hess
57ec60d6f3
mdwn man page and more complete docs
2014-11-22 12:13:38 -04:00
Joey Hess
f62d2fb183
propellor --spin can now deploy propellor to hosts that do not have git, ghc, or apt-get. This is accomplished by uploading a fairly portable precompiled tarball of propellor.
2014-11-22 00:22:19 -04:00
Joey Hess
1b56e73c07
copyright update
2014-11-21 22:27:13 -04:00
Joey Hess
09e3bdedf5
Merge branch 'joeyconfig'
2014-11-21 21:10:08 -04:00
Joey Hess
b4e1bb84d5
hmm
2014-11-21 21:10:01 -04:00
Joey Hess
072eede646
Merge branch 'joeyconfig'
2014-11-21 21:08:39 -04:00
Joey Hess
a0c7cddd1d
maintainer
2014-11-21 21:08:30 -04:00
Joey Hess
d65a4fad6c
Merge branch 'joeyconfig'
2014-11-21 20:58:48 -04:00
Joey Hess
886bd3715b
prep release
2014-11-21 20:58:09 -04:00
Joey Hess
e60b261dae
Merge branch 'joeyconfig'
2014-11-21 17:29:47 -04:00
Joey Hess
1af298dc10
trim
2014-11-21 01:14:19 -04:00
Joey Hess
1eaeddc2eb
Merge branch 'joeyconfig'
2014-11-20 19:21:22 -04:00
Joey Hess
f9cc7c149e
incomplete systemd container support
2014-11-20 17:18:26 -04:00
Joey Hess
2293b46bf7
fix chroot info propigation
2014-11-20 16:04:48 -04:00
Joey Hess
02b8b2dec7
Merge branch 'joeyconfig'
2014-11-20 00:58:51 -04:00
Joey Hess
d49d251897
separate docker container type
...
Docker containers are now a separate data type, cannot be included in the
main host list, and are instead passed to Docker.docked. (API change)
2014-11-19 23:11:34 -04:00
Joey Hess
41b10a956a
correct version
2014-11-19 21:25:55 -04:00
Joey Hess
4a9bbd1391
Added support for using debootstrap from propellor.
...
Most of the hard part was making it be able to install debootstrap from
source, for use on non-debian-derived systems.
2014-11-19 19:30:56 -04:00
Joey Hess
5c34a575c8
flag API changes
2014-11-19 02:02:29 -04:00
Joey Hess
dd635e9fcd
update
2014-11-19 01:59:09 -04:00
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