Permalink
Browse files

README update

  • Loading branch information...
1 parent 17e1296 commit e45a351b1528133d26b824b71b36b0948adb27c5 @apsoto committed Aug 25, 2011
Showing with 44 additions and 6 deletions.
  1. +44 −0 README.md
  2. +0 −6 README.rdoc
View
44 README.md
@@ -0,0 +1,44 @@
+# Overview #
+Chef cookbook for the [monit](http://mmonit.com/monit/) monitoring and
+management tool.
+
+# How to add to your cookbook repository #
+
+## Download the tarball ##
+It's up on the opscode
+[cookbook community](http://community.opscode.com/cookbooks/monit) site.
+
+## Vendor via knife ##
+
+ $ knife cookbook site download monit
+
+## Track upstream changes via git ##
+This is what I use for my chef repos so I can push/pull changes with minimal
+hassle.
+
+I use the subtree merge strategy explained in the
+[Pro Git](http://progit.org/book/ch6-7.html) book.
+
+#### Track the monit repo ####
+ $ cd YOUR_REPO_ROOT
+ $ git remote add chef-monit-remote git://github.com/apsoto/chef-monit.git
+ $ git fetch chef-monit-remote
+ $ git checkout -b chef-monit-upstream chef-monit-remote/master
+ $ git checkout master
+ $ git read-tree --prefix=cookbooks/monit -u chef-monit-upstream
+
+#### Pull in upstream changes ####
+ $ git checkout chef-monit-upstream
+ $ git pull
+ $ git checkout master
+ $ git merge --squash -s subtree --no-commit chef-monit-upstream
+
+History
+=======
+
+version 0.6
+-----------
+ * Released to github
+ * Defaults no alert on ACTION event.
+ When you manually stop/start a service, alerting me about what I just did isn't useful.
+
View
6 README.rdoc
@@ -1,6 +0,0 @@
-= History
-
-== in progress
- * Default no alert on ACTION event. When you manually stop/start a service,
- telling me what I just did isn't useful.
-

0 comments on commit e45a351

Please sign in to comment.