summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2012-11-06 11:09:45 +0100
committervarac <varacanero@zeromail.org>2012-11-06 11:09:45 +0100
commit1493ca871a596380f3db6feeb2c0621a597d4f30 (patch)
treeae5dda6dba81b77ca159cd1aa9e0bb32a13a3da7 /.gitmodules
parente6d9dca1e6c695e52f5052cb6877787e13bb0fb2 (diff)
parent7ca4f22e4cd76d986fece61674f487809d1369c6 (diff)
Merge branch 'feature/couchdb' into develop
Conflicts: puppet/modules/site_shorewall/manifests/eip.pp
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index e3e8d6db..c2d42cc5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,3 +37,7 @@
[submodule "puppet/modules/interfaces"]
path = puppet/modules/interfaces
url = git://github.com/x-way/puppet-interfaces.git
+[submodule "puppet/modules/apache"]
+ path = puppet/modules/apache
+ url = git://code.leap.se/puppet_apache
+