summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-06-05 09:51:14 +0000
committervarac <varacanero@zeromail.org>2015-06-05 09:51:14 +0000
commit40e53a905a6b7de338d3ff11d8a688b086870073 (patch)
tree29c6cee08e97f4601f3e98d0a917d82ec2214cee /puppet
parent90142c3bc7dcbc4ec5384a11664a4b6d5e568439 (diff)
parentb4cc317aaf95e76fe648ef36895f6d4ba6fea490 (diff)
Merge branch '0.7.0' into '0.7.0'
0.7.0 See merge request !50
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apt/manifests/init.pp6
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/modules/site_apt/manifests/init.pp b/puppet/modules/site_apt/manifests/init.pp
index c32c29c4..02f85140 100644
--- a/puppet/modules/site_apt/manifests/init.pp
+++ b/puppet/modules/site_apt/manifests/init.pp
@@ -31,6 +31,12 @@ class site_apt {
priority => 999
}
+ apt::preferences_snippet { 'leap':
+ priority => 999,
+ package => '*',
+ pin => 'origin "deb.leap.se"'
+ }
+
# All packages should be installed _after_ refresh_apt is called,
# which does an apt-get update.
# There is one exception: