Remove pixelated apt repo and deb vagrant box
authorvarac <varacanero@zeromail.org>
Wed, 24 May 2017 08:45:42 +0000 (10:45 +0200)
committervarac <varacanero@zeromail.org>
Wed, 24 May 2017 08:45:42 +0000 (10:45 +0200)
Vagrantfile
provisioning/manifests/deb.pp [deleted file]
provisioning/modules/pixelated/manifests/apt.pp

index 5d8a66d..5877050 100644 (file)
@@ -6,7 +6,7 @@ VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "LEAP/jessie"
 
-  config.vm.define "source", primary: true do |source|
+  config.vm.define "source" do |source|
     source.vm.provision "puppet" do |puppet|
       puppet.manifests_path = "provisioning/manifests"
       puppet.module_path    = "provisioning/modules"
@@ -14,14 +14,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  config.vm.define "deb", autostart: false do |deb|
-    deb.vm.provision "puppet" do |puppet|
-      puppet.manifests_path = "provisioning/manifests"
-      puppet.module_path    = "provisioning/modules"
-      puppet.manifest_file  = "deb.pp"
-    end
-  end
-
   if /mswin|mingw/ =~ RUBY_PLATFORM
     config.vm.synced_folder ".", "/vagrant", type: "rsync", rsync__exclude: ".git/"
   end
diff --git a/provisioning/manifests/deb.pp b/provisioning/manifests/deb.pp
deleted file mode 100644 (file)
index 2345094..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-class { '::pixelated::apt': } ->
-class { '::pixelated::common': } ->
-class { '::pixelated::useragent': }
-
index caf9606..2fd7427 100644 (file)
@@ -1,24 +1,9 @@
 # add the pixelated sources needed to install everything
 class pixelated::apt {
-
   package { [
     'apt-transport-https',
     'lsb-release']:
-    ensure => installed
-  }
-
-  # pixelated repo
-  file { '/etc/apt/sources.list.d/pixelated.list':
-    source  => 'puppet:///modules/pixelated/apt/pixelated.list',
-    owner   => 'root',
-    require => Exec['add_pixelated_key'],
-    notify  => Exec['apt_get_update'],
-  }
-
-  exec{'add_pixelated_key':
-    command => '/usr/bin/apt-key adv --keyserver pool.sks-keyservers.net --recv-keys F4C220FCD74F4DF45DD78FC0287A1542472DC0E3',
-    unless  => '/usr/bin/apt-key finger 2>&1 | grep -q "F4C2 20FC D74F 4DF4 5DD7  8FC0 287A 1542 472D C0E3"',
-    notify  => Exec['apt_get_update'],
+      ensure => installed
   }
 
   # nodejs latest repo