diff options
| author | varac <varacanero@zeromail.org> | 2012-09-24 17:40:38 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2012-09-24 17:40:38 +0200 |
| commit | f003f3525454caef7e70b27ccf7ca2c1408213d5 (patch) | |
| tree | 232d73cd224752a6d77ce23c1a70098e84711df7 | |
| parent | 8320de2fd5bd8fcb429dfc1b68527a1c39a8341f (diff) | |
| parent | 967c231e754d769225e26cbd7b2ad3738bce833b (diff) | |
Merge branch 'master' into openvpn
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | puppet/modules/apt | 0 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index a7781983..c3e82a04 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "puppet/modules/sshd"] path = puppet/modules/sshd url = git://labs.riseup.net/shared-sshd +[submodule "puppet/modules/apt"] + path = puppet/modules/apt + url = git://code.leap.se/puppet_apt diff --git a/puppet/modules/apt b/puppet/modules/apt new file mode 160000 +Subproject 02bd3269948f1a3c5a586e581a7fec22da69a2c |