cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-02-12 12:41:08 -04:00
parent f765a05f88 514bc70c39
commit 7d4adb5348
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-simple.hs
View File

@ -33,7 +33,7 @@ hosts =
& File.dirExists "/var/www" & File.dirExists "/var/www"
& Docker.docked webserverContainer & Docker.docked webserverContainer
& Docker.garbageCollected `period` Daily & Docker.garbageCollected `period` Daily
& Cron.runPropellor "30 * * * *" & Cron.runPropellor (Cron.Times "30 * * * *")
-- add more hosts here... -- add more hosts here...
--, host "foo.example.com" = ... --, host "foo.example.com" = ...

2
doc/centralized_git_repository.mdwn
View File

@ -22,7 +22,7 @@ You can add a central git repository to your existing propellor setup easily:
`cd ~/.propellor/; git remote add deploy git://git.example.com/propellor.git` `cd ~/.propellor/; git remote add deploy git://git.example.com/propellor.git`
2. Add a property to your hosts like: 2. Add a property to your hosts like:
`Cron.runPropellor "*/30 * * * *"` `Cron.runPropellor (Cron.Times "*/30 * * * *")`
3. Let your hosts know about the changed configuration (including the url 3. Let your hosts know about the changed configuration (including the url
to the central repository), by running `propellor --spin $HOST` for each to the central repository), by running `propellor --spin $HOST` for each

2
doc/haskell_newbie.mdwn
View File

@ -66,7 +66,7 @@ Some other properties you may find in your config.hs, or want to add:
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& User.hasSomePassword "root" & User.hasSomePassword "root"
& "/etc/default/foodaemon" `File.containsLine` "ENABLED=yes" & "/etc/default/foodaemon" `File.containsLine` "ENABLED=yes"
& Cron.runPropellor "30 * * * *" & Cron.runPropellor (Cron.Times "30 * * * *")
"""]] """]]
Some of these properties can be reverted -- this makes Propellor undo whatever Some of these properties can be reverted -- this makes Propellor undo whatever