From e0d2761e00b76f6857fbd57ff846dbcfe1530465 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Nov 2014 11:43:08 -0400 Subject: update --- doc/usage.mdwn | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/doc/usage.mdwn b/doc/usage.mdwn index e83e8def..093ec34e 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -11,14 +11,22 @@ propellor [options] `propellor` is a property-based host configuration management program written and configured in haskell. -The first time you run `propellor`, without any options, -it will set up a `~/.propellor/` repository. -Edit `~/.propellor/config.hs` to configure it. +# MODES OF OPERATION -Once propellor is configured, running it without any options will take -action as needed to satisfy the configured properties of the local host. +* The first time you run `propellor`, without any options, + it will set up a `~/.propellor/` repository. + Edit `~/.propellor/config.hs` to configure it. -# OPTIONS +* Once propellor is configured, running it without any options will take + action as needed to satisfy the configured properties of the local host. + + If there's a central git repository, it will first fetch from the + repository, check the gpg signature and merge, and rebuild propellor, + so that any configuration changes will immediately take effect. + + If propellor is run by a non-root user without any options, this is + the same as running propellor --spin with the hostname of the local + host. * --spin targethost [targethost ...] [--via relayhost] -- cgit v1.2.3