diff options
author | varac <varacanero@zeromail.org> | 2017-05-30 13:12:14 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2017-05-30 13:12:14 +0200 |
commit | 4f5190de1e27f24bae8b094e54254cce9fc8bf6b (patch) | |
tree | 12367bae38f3bd1bf138ec09413df05caa6a77a4 | |
parent | 6c52f7a01a0067a1638fd8d64fb7e3030f9b0506 (diff) |
Use phantomjs from jessie-backports
-rwxr-xr-x | provisioning/modules/phantomjs/files/phantomjs | bin | 67932064 -> 0 bytes | |||
-rw-r--r-- | provisioning/modules/phantomjs/manifests/init.pp | 11 | ||||
-rw-r--r-- | provisioning/modules/pixelated/manifests/source.pp | 4 |
3 files changed, 2 insertions, 13 deletions
diff --git a/provisioning/modules/phantomjs/files/phantomjs b/provisioning/modules/phantomjs/files/phantomjs Binary files differdeleted file mode 100755 index d72e801c..00000000 --- a/provisioning/modules/phantomjs/files/phantomjs +++ /dev/null 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 } |