From 4f5190de1e27f24bae8b094e54254cce9fc8bf6b Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 30 May 2017 13:12:14 +0200
Subject: Use phantomjs from jessie-backports

---
 provisioning/modules/phantomjs/files/phantomjs     | Bin 67932064 -> 0 bytes
 provisioning/modules/phantomjs/manifests/init.pp   |  11 -----------
 provisioning/modules/pixelated/manifests/source.pp |   4 ++--
 3 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100755 provisioning/modules/phantomjs/files/phantomjs
 delete mode 100644 provisioning/modules/phantomjs/manifests/init.pp

diff --git a/provisioning/modules/phantomjs/files/phantomjs b/provisioning/modules/phantomjs/files/phantomjs
deleted file mode 100755
index d72e801c..00000000
Binary files a/provisioning/modules/phantomjs/files/phantomjs and /dev/null differ
diff --git a/provisioning/modules/phantomjs/manifests/init.pp b/provisioning/modules/phantomjs/manifests/init.pp
deleted file mode 100644
index 52500f48..00000000
--- a/provisioning/modules/phantomjs/manifests/init.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-# install phantomjs for unit tests
-# we ship our local copy of phantomjs
-# because downloading phantomjs fails regularly
-class phantomjs {
-  file{'/usr/local/bin/phantomjs':
-    source => 'puppet:///modules/phantomjs/phantomjs',
-    owner  => 'root',
-    group  => 'root',
-    mode   => '0755',
-  }
-}
diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp
index cbb5c001..de4ade1e 100644
--- a/provisioning/modules/pixelated/manifests/source.pp
+++ b/provisioning/modules/pixelated/manifests/source.pp
@@ -1,6 +1,5 @@
 # install requirements for setting up the useragent from source
 class pixelated::source {
-  include phantomjs
 
   package { [
     'git',
@@ -16,7 +15,8 @@ class pixelated::source {
     'ruby-compass',
     'xvfb',
     'xauth',
-    'chromedriver'
+    'chromedriver',
+    'phantomjs'
     ]:
       ensure => latest
   }
-- 
cgit v1.2.3