summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Larizza <gary@puppetlabs.com>2012-07-08 21:12:05 -0700
committerGary Larizza <gary@puppetlabs.com>2012-07-08 21:12:05 -0700
commite75b807f8571cff4bae145dd4c37773fb16a694f (patch)
treec3cf4642b8ce9341314f7ab92fca97df0ad44967
parent580e831fbb7ba60cc0206661a8cfe263613c2b5e (diff)
parent1bb2ef6b72a4e0f0cb22a6c9348a1c9c0b56ac54 (diff)
Merge pull request #8 from rtyler/chicken-dinner
Tidy up the place
-rw-r--r--.gitmodules3
-rw-r--r--README14
-rw-r--r--README.md24
m---------spec/fixtures/modules/concat0
4 files changed, 27 insertions, 14 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..033526f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "spec/fixtures/modules/concat"]
+ path = spec/fixtures/modules/concat
+ url = git://github.com/ripienaar/puppet-concat.git
diff --git a/README b/README
deleted file mode 100644
index 76b6667..0000000
--- a/README
+++ /dev/null
@@ -1,14 +0,0 @@
-haproxy
-
-This haproxy uses storeconfigs to collect and realize balancer member servers
-on a load balancer server. Currently Redhat family OSes are supported, but
-support for other OS Families shouldn't be too difficult to merge in. Pull
-requests accepted!
-
-License
--------
-Apache 2.0
-
-Contact
--------
-Gary Larizza <gary@puppetlabs.com>
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..9c1f90c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,24 @@
+# haproxy
+
+This haproxy uses storeconfigs to collect and realize balancer member servers
+on a load balancer server. Currently Redhat family OSes are supported, but
+support for other OS Families shouldn't be too difficult to merge in. Pull
+requests accepted!
+
+## Hacking
+
+After cloning the repository, execute `git submodule update --init` to pull in
+any dependencies needed to test the module locally.
+
+1. `git submodule update --init`
+1. `rake spec` # To run the tests
+1. Hack Hack Hack # Adding tests hopefully!
+1. Commit and send a pull request!
+
+## License
+
+Apache 2.0
+
+## Contact
+
+Gary Larizza <gary@puppetlabs.com>
diff --git a/spec/fixtures/modules/concat b/spec/fixtures/modules/concat
new file mode 160000
+Subproject 52dbf4a61a0a47b82b5213def9fe19b7af47a49