opuppet/module-apt
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge commit '1b0bc415977c1c8b49390e0cdb1361769e0fdbae'.

Browse source 
Merging one more commit.

Conflicts:
	files/preferences
	templates/Debian/sources.list.deb-src.erb
	templates/Debian/sources.list.volatile.erb
	templates/Ubuntu/sources.list.backports.erb
	templates/Ubuntu/sources.list.deb-src.erb
This commit is contained in:
intrigeri 2010-11-21 16:38:50 +01:00
commit 71d42350d1
5 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
files/02show_upgraded
View file

@ -1 +1,4 @@
# This file is brought to you by Puppet
# all local modifications will be overwritten
APT::Get::Show-Upgraded true;

3
files/03clean
View file

@ -1 +1,4 @@
# This file is brought to you by Puppet
# all local modifications will be overwritten
DSelect::Clean auto;

3
templates/20proxy.erb
View file

@ -1 +1,4 @@
# This file is brought to you by Puppet
# all local modifications will be overwritten
Acquire::http { Proxy "http://<%= real_apt_proxy %>:<%= real_apt_proxy_port %>"; };

1
templates/Debian/sources.list.erb
View file

@ -1,4 +1,5 @@
# This file is brought to you by puppet
# all local modifications will be overwritten
### Debian current: <%= codename %>

1
templates/Ubuntu/sources.list.erb
View file

@ -1,4 +1,5 @@
# This file is brought to you by puppet
# all local modifications will be overwritten
# basic <%= lsbdistcodename %>
deb <%= ubuntu_url %> <%= lsbdistcodename %> <%= repos %>