diff options
| author | Micah Anderson <micah@riseup.net> | 2013-07-09 16:43:39 +0100 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-07-09 16:43:39 +0100 |
| commit | b4077083b971377636754b2988668a6ddd384da5 (patch) | |
| tree | b8e358b5f0f6dfa882d31d7446266111bc0d201b /.gitmodules | |
| parent | 625aaa11138bba365958391664299692402f8da4 (diff) | |
| parent | 672154a8322901b86c9882854234eae53221a38e (diff) | |
Merge remote-tracking branch 'origin/develop'0.2.2
Conflicts:
provider_base/services/webapp.json
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 21966fc3..717ae5ed 100644 --- a/.gitmodules +++ b/.gitmodules @@ -39,7 +39,7 @@ url = git://code.leap.se/puppet_bundler [submodule "puppet/modules/vcsrepo"] path = puppet/modules/vcsrepo - url = git://github.com/puppetlabs/puppetlabs-vcsrepo.git + url = git://labs.riseup.net/module_vcs [submodule "puppet/modules/rubygems"] path = puppet/modules/rubygems url = git://code.leap.se/puppet_rubygems @@ -67,3 +67,9 @@ [submodule "puppet/modules/tor"] path = puppet/modules/tor url = git://labs.riseup.net/shared-tor +[submodule "puppet/modules/stunnel"] + path = puppet/modules/stunnel + url = git://code.leap.se/puppet_stunnel +[submodule "puppet/modules/haproxy"] + path = puppet/modules/haproxy + url = git://code.leap.se/puppet_haproxy |