summaryrefslogtreecommitdiff
path: root/provisioning/modules
diff options
context:
space:
mode:
authorPatrick Maia <patrickjourdanmaia@gmail.com>2015-02-06 21:27:58 +0000
committervarac <varacanero@zeromail.org>2015-02-09 13:49:44 +0100
commit687b30209b628d4a9678df29d0ac8ef8bf657b4f (patch)
tree59fe6748336a10aa0247bb2b71e149070a71f96b /provisioning/modules
parentff4ebf784e4df248c20d01dcc7e8905aee74d79c (diff)
Fix debian package dependencies in Vagrant deb box when using wheezy #278
Diffstat (limited to 'provisioning/modules')
-rw-r--r--provisioning/modules/pixelated/files/apt/pixelated-preferences11
-rw-r--r--provisioning/modules/pixelated/files/apt/pixelated.list3
-rw-r--r--provisioning/modules/pixelated/manifests/apt.pp8
3 files changed, 21 insertions, 1 deletions
diff --git a/provisioning/modules/pixelated/files/apt/pixelated-preferences b/provisioning/modules/pixelated/files/apt/pixelated-preferences
new file mode 100644
index 00000000..cc01f73f
--- /dev/null
+++ b/provisioning/modules/pixelated/files/apt/pixelated-preferences
@@ -0,0 +1,11 @@
+Package: python-twisted*
+Pin: release a=wheezy-backports
+Pin-Priority: 999
+
+Package: python-whoosh
+Pin: origin packages.pixelated-project.org
+Pin-Priority: 999
+
+Package: python-pycryptopp
+Pin: release a=wheezy-backports
+Pin-Priority: 999
diff --git a/provisioning/modules/pixelated/files/apt/pixelated.list b/provisioning/modules/pixelated/files/apt/pixelated.list
new file mode 100644
index 00000000..e5aa0aee
--- /dev/null
+++ b/provisioning/modules/pixelated/files/apt/pixelated.list
@@ -0,0 +1,3 @@
+deb http://packages.pixelated-project.org/debian wheezy-snapshots main
+deb http://packages.pixelated-project.org/debian wheezy-backports main
+deb http://packages.pixelated-project.org/debian wheezy main
diff --git a/provisioning/modules/pixelated/manifests/apt.pp b/provisioning/modules/pixelated/manifests/apt.pp
index 14517977..4519fb21 100644
--- a/provisioning/modules/pixelated/manifests/apt.pp
+++ b/provisioning/modules/pixelated/manifests/apt.pp
@@ -3,12 +3,18 @@ class pixelated::apt {
# pixelated repo
file { '/etc/apt/sources.list.d/pixelated.list':
- content => "deb http://packages.pixelated-project.org/debian wheezy-snapshots main\ndeb http://packages.pixelated-project.org/debian wheezy-backports main\ndeb http://packages.pixelated-project.org/debian wheezy main\n",
+ source => 'puppet:///modules/pixelated/apt/pixelated.list',
owner => 'root',
require => Exec['add_pixelated_key'],
notify => Exec['apt_get_update'],
}
+ file { '/etc/apt/preferences.d/pixelated':
+ source => 'puppet:///modules/pixelated/apt/pixelated-preferences',
+ owner => 'root',
+ notify => Exec['apt_get_update'],
+ }
+
file { '/tmp/0x287A1542472DC0E3_packages@pixelated-project.org.asc':
source => 'puppet:///modules/pixelated/0x287A1542472DC0E3_packages@pixelated-project.org.asc',
notify => Exec['add_pixelated_key']