From: Silvio Rhatto Date: Tue, 2 Jan 2018 20:59:18 +0000 (-0200) Subject: Adds nodo::subsystem::apt::mirror param X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b7d1fbbab70463e8da7825c74c294553590945ca;p=puppet-nodo.git Adds nodo::subsystem::apt::mirror param --- diff --git a/manifests/subsystem/apt.pp b/manifests/subsystem/apt.pp index 409a9e3..f162705 100644 --- a/manifests/subsystem/apt.pp +++ b/manifests/subsystem/apt.pp @@ -3,6 +3,7 @@ class nodo::subsystem::apt( $auto_upgrade = present, $hour = 2, $minute = 0, + $mirror = 'http://deb.debian.org', ) { # See https://www.cyberciti.biz/faq/howto-use-apt-get-with-ipv6-or-ipv4-transport-on-ubuntu-debian/ # https://unix.stackexchange.com/questions/370750/wget-uses-ipv6-address-and-takes-too-long-to-complete diff --git a/templates/apt/Debian.sources.list.erb b/templates/apt/Debian.sources.list.erb index 7801dc8..887e940 100644 --- a/templates/apt/Debian.sources.list.erb +++ b/templates/apt/Debian.sources.list.erb @@ -4,11 +4,11 @@ ### Debian current: <%= scope.lookupvar('::lsbdistcodename') %> # basic -deb http://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %> main contrib non-free +deb <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %> main contrib non-free deb-src http://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %> main contrib non-free # updates -deb http://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-updates main contrib non-free +deb <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-updates main contrib non-free deb-src http://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-updates main contrib non-free # security @@ -16,5 +16,5 @@ deb http://security.debian.org/ <%= scope.lookupvar('::lsbdistcodename') %>/upda deb-src http://security.debian.org/ <%= scope.lookupvar('::lsbdistcodename') %>/updates main contrib non-free # backports -deb http://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-backports main contrib non-free -deb-src http://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-backports main contrib non-free +deb <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-backports main contrib non-free +deb-src <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-backports main contrib non-free