projects / mirror / dsa-puppet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c955304 479f328)
Merge remote-tracking branch 'waldi/srv-mirrors'
authorPeter Palfrader <peter@palfrader.org>
Fri, 10 Feb 2017 20:35:31 +0000 (21:35 +0100)
committerPeter Palfrader <peter@palfrader.org>
Fri, 10 Feb 2017 20:35:31 +0000 (21:35 +0100)
commit9fcfecbfcca2dcf3f446d3b6fe989f40143392f4
tree782b631938a1215569d9a0810a800b468fcf7e18tree | snapshot
parentc955304e3a0ce110ad050992a0d28462f50dc903commit | diff
parent479f3289576347868269b93c26260e399f8069b8commit | diff
Merge remote-tracking branch 'waldi/srv-mirrors'

* waldi/srv-mirrors:
  Setup /srv/mirrors/debian-security on security_mirror
  Setup /srv/mirrors on all (archvsync-based) mirrors

Conflicts:
modules/roles/manifests/ftp.pp
modules/roles/manifests/ftp.pp diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.