summaryrefslogtreecommitdiff
path: root/files/puppet/modules/custom/manifests/init.pp
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2017-09-06 16:05:26 -0700
committerelijah <elijah@riseup.net>2017-09-06 16:05:26 -0700
commit1b48720f040df62952d55d8e7e67a3cd9c7d483c (patch)
tree0fc9b988b21ef5ffec5b735a01b947ab031f301e /files/puppet/modules/custom/manifests/init.pp
parenta80c3fa858976cb33b6a507279cccdca996471b3 (diff)
parent142900149d82132f83cf76492222c70a5ca29887 (diff)
Merge branch 'master' of ssh://leap.se/bitmask
Diffstat (limited to 'files/puppet/modules/custom/manifests/init.pp')
-rw-r--r--files/puppet/modules/custom/manifests/init.pp8
1 files changed, 6 insertions, 2 deletions
diff --git a/files/puppet/modules/custom/manifests/init.pp b/files/puppet/modules/custom/manifests/init.pp
index 0a67491..db5dfbb 100644
--- a/files/puppet/modules/custom/manifests/init.pp
+++ b/files/puppet/modules/custom/manifests/init.pp
@@ -22,7 +22,11 @@ class custom {
include custom_munin_node::openvpn
}
- if member ( $services, 'pixelated') {
- include ::pixelated
+ # Use additional packages from master repo
+ if $::domain == 'unstable.bitmask.net' {
+ ::custom::apt::additional_sources {'leap-master':
+ component => 'master'
+ }
}
+
}