git subrepo clone --force https://github.com/pixelated/puppet-pixelated.git files/puppet/modules/pixelated

subrepo:
  subdir:   "files/puppet/modules/pixelated"
  merged:   "0b29fe6"
upstream:
  origin:   "https://github.com/pixelated/puppet-pixelated.git"
  branch:   "master"
  commit:   "0b29fe6"
git-subrepo:
  version:  "0.3.0"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "841aa43"

1 files changed, 13 insertions, 7 deletions

diff --git a/files/puppet/modules/pixelated/manifests/apt/preferences.pp b/files/puppet/modules/pixelated/manifests/apt/preferences.pp
index 719117b..51e16c9 100644
--- a/files/puppet/modules/pixelated/manifests/apt/preferences.pp
+++ b/files/puppet/modules/pixelated/manifests/apt/preferences.pp
@@ -6,13 +6,19 @@ class pixelated::apt::preferences {
     priority => 999
   }
 
-  apt::preferences_snippet { ['soledad-server',
-    'soledad-common',
-    'soledad-client',
-    'leap-keymanager',
-    'leap-auth']:
-      pin      => 'release o=pixelated',
-      priority => 999,
+  apt::preferences_snippet { 'pixelated':
+    priority => 1000,
+    package  => '*',
+    pin      => 'origin "packages.pixelated-project.org"'
+  }
+
+  file { [
+    '/etc/apt/preferences.d/soledad-client',
+    '/etc/apt/preferences.d/soledad-server',
+    '/etc/apt/preferences.d/soledad-common',
+    '/etc/apt/preferences.d/leap-keymanager',
+    '/etc/apt/preferences.d/leap-auth']:
+      ensure => absent
   }
 
 }