Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-11-18 21:26:30 -04:00
commit da8411c1f1
2 changed files with 9 additions and 10 deletions

7
debian/changelog vendored
View File

@ -1,10 +1,9 @@
propellor (0.9.3) UNRELEASED; urgency=medium propellor (0.9.3) UNRELEASED; urgency=medium
* propellor --spin can now be used to update remote hosts, without * propellor --spin can now be used to update remote hosts, without
any central git repository being used. The git repository is updated any central git repository needed. The central git repository is
over propellor's ssh connection to the remote host. The central still useful for running propellor from cron, but this simplifies
git repository is still useful for running propellor from cron, getting started with propellor, and allows for more ad-hoc usage.
but this simplifies getting started with propellor.
* The git repo url, if any, is updated whenever propellor --spin is used. * The git repo url, if any, is updated whenever propellor --spin is used.
* Added prosody module, contributed by Félix Sipma. * Added prosody module, contributed by Félix Sipma.
* Can be used to configure tor hidden services. Thanks, Félix Sipma. * Can be used to configure tor hidden services. Thanks, Félix Sipma.

View File

@ -35,25 +35,25 @@ see [configuration for the Haskell newbie](https://propellor.branchable.com/hask
## quick start ## quick start
1. Get propellor installed on your laptop. 1. Get propellor installed on your development machine (ie, laptop).
`cabal install propellor` `cabal install propellor`
or or
`apt-get install propellor` `apt-get install propellor`
2. Run propellor for the first time. It will set up a `~/.propellor/` git 2. Run `propellor` for the first time. It will set up a `~/.propellor/` git
repository for you. repository for you.
3. If you don't have a gpg private key already, generate one: `gpg --gen-key` 3. If you don't have a gpg private key already, generate one: `gpg --gen-key`
4. Run: `propellor --add-key $KEYID`, which will make propellor trust 4. Run: `propellor --add-key $KEYID`, which will make propellor trust
your gpg key, and will sign your `~/.propellor` repository using it. your gpg key, and will sign your `~/.propellor` repository using it.
5. Edit `~/.propellor/config.hs`, and add a host you want to manage. 5. Edit `~/.propellor/config.hs`, and add a host you want to manage.
You can start by not adding any properties, or only a few. You can start by not adding any properties, or only a few.
6. Pick a host and run: `propellor --spin $HOST` 6. Run: `propellor --spin $HOST`
7. Now you have a simple propellor deployment, but it doesn't do 7. Now you have a simple propellor deployment, but it doesn't do
much to the host yet, besides installing propellor. much to the host yet, besides installing propellor.
So, edit `~/.propellor/config.hs` to configure the host (maybe So, edit `~/.propellor/config.hs` to configure the host, add some
start with a few simple properties), and re-run step 6. properties to it, and re-run step 6.
Repeat until happy and move on to the next host. :) Repeat until happy and move on to the next host. :)
8. Optionally, set up a [centralized git repository](https://propellor.branchable.com/centralized_git_repository/) 8. Optionally, set up a [centralized git repository](https://propellor.branchable.com/centralized_git_repository/)
so multiple hosts can be updated with a simple `git commit -S; git push` so that multiple hosts can be updated with a simple `git commit -S; git push`
9. Write some neat new properties and send patches! 9. Write some neat new properties and send patches!
## debugging ## debugging