summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJoey Hess2014-03-30 21:06:24 -0400
committerJoey Hess2014-03-30 21:06:24 -0400
commit25a12dd8f0e05165c5b7bed2b0e7b62d75b59e5c (patch)
treee347e9172e14ed344cabbf61b2792539b2d82a27 /README
parent5da737d027c6858fe737f6611d497b79287ec5ea (diff)
tweaks
Diffstat (limited to 'README')
-rw-r--r--README6
1 files changed, 3 insertions, 3 deletions
diff --git a/README b/README
index b646fea9..84c4b81f 100644
--- a/README
+++ b/README
@@ -8,8 +8,8 @@ The design is intentionally very minimal.
Propellor lives in a git repository, and so to set it up it's cloned
to a system, and "make" can be used to pull down any new changes,
-and compile and run propellor. This can be done by a cron job. Or something
-can ssh in and run it.
+and compile and run propellor. This can be done by a cron job, or
+something can ssh in and run it.
Properties are defined using Haskell. Edit Propellor.hs
@@ -36,7 +36,7 @@ for each host and be annoying.
Instead, propellor --spin $host looks for a privdata/$host.gpg file and
if found decrypts it and sends it to the host using ssh. To set a field
in such a file, use: propellor --set $host $field
-The field name is will be something like 'Password "root"'; see PrivData.hs
+The field name will be something like 'Password "root"'; see PrivData.hs
for available fields.
[1] http://reclass.pantsfullofunix.net/