summaryrefslogtreecommitdiff
path: root/provisioning/modules/pixelated
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-02-04 09:50:10 +0100
committervarac <varacanero@zeromail.org>2016-02-04 09:50:10 +0100
commit994c90088c51bc1014d4708c0be55216592bf6d9 (patch)
tree476df2e5b2de2b215015399918252c995a7e60fc /provisioning/modules/pixelated
parentcd9faaf80cd9c7374aabaaedb2af3c0ce59dd680 (diff)
fix installation of useragent deb package
Diffstat (limited to 'provisioning/modules/pixelated')
-rw-r--r--provisioning/modules/pixelated/files/apt/pixelated-preferences20
-rw-r--r--provisioning/modules/pixelated/files/apt/pixelated.list5
-rw-r--r--provisioning/modules/pixelated/manifests/apt.pp8
3 files changed, 3 insertions, 30 deletions
diff --git a/provisioning/modules/pixelated/files/apt/pixelated-preferences b/provisioning/modules/pixelated/files/apt/pixelated-preferences
deleted file mode 100644
index fbb5e1bd..00000000
--- a/provisioning/modules/pixelated/files/apt/pixelated-preferences
+++ /dev/null
@@ -1,20 +0,0 @@
-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
-
-Package: python-requests
-Pin: release a=wheezy-backports
-Pin-Priority: 999
-
-# python-requests from backports depends on python-urllib3 (>= 1.7.1)
-Package: python-urllib3
-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
index e5aa0aee..ed30cec3 100644
--- a/provisioning/modules/pixelated/files/apt/pixelated.list
+++ b/provisioning/modules/pixelated/files/apt/pixelated.list
@@ -1,3 +1,2 @@
-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
+deb http://packages.pixelated-project.org/debian jessie-snapshots main
+deb http://packages.pixelated-project.org/debian jessie main
diff --git a/provisioning/modules/pixelated/manifests/apt.pp b/provisioning/modules/pixelated/manifests/apt.pp
index 1c4e06f6..91af37e3 100644
--- a/provisioning/modules/pixelated/manifests/apt.pp
+++ b/provisioning/modules/pixelated/manifests/apt.pp
@@ -16,12 +16,6 @@ class pixelated::apt {
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']
@@ -36,7 +30,7 @@ class pixelated::apt {
# leap repo
file { '/etc/apt/sources.list.d/leap.list':
- content => 'deb http://deb.leap.se/0.6 wheezy main',
+ content => 'deb http://deb.leap.se/0.6 jessie main',
owner => 'root',
require => Exec['add_leap_key'],
notify => Exec['apt_get_update'],