Skip to content
This repository has been archived by the owner on Aug 25, 2020. It is now read-only.

Commit

Permalink
we have to install phantomjs manually as Ubuntu would install version…
Browse files Browse the repository at this point in the history
… 1.9.0 which renders slightly different
  • Loading branch information
tsteur committed Oct 29, 2014
1 parent db13c2a commit 1370525
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 6 deletions.
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -40,6 +40,7 @@ This is work in progress
4. `vagrant plugin install vagrant-aws`
5. Provide AWS keyname, access key & secret key in `vagrantconfig_local.yaml`
6. `vagrant up --provider=aws`
7. Execute `puppet/files/setup.sh` once (we should add this to Puppet)

### Usage

Expand Down
23 changes: 19 additions & 4 deletions puppet/files/setup.sh
@@ -1,15 +1,30 @@
## Remove xdebug for faster test results
sudo rm /etc/php5/cli/conf.d/20-xdebug.ini
sudo rm /etc/php5/apache2/conf.d/20-xdebug.ini
sudo rm /etc/php5/fpm/conf.d/20-xdebug.ini
cp www/piwik/config/config.ini.php /home/ubuntu/www/piwik/config/config.ini.php
cp etc/mysql/my.cnf /etc/mysql/my.cnf

## Prepare configs
## cp www/piwik/config/config.ini.php /home/ubuntu/www/piwik/config/config.ini.php
## cp etc/mysql/my.cnf /etc/mysql/my.cnf
## todo update apparmor for load infile support

## Restart services
sudo service mysql restart
sudo service apache2 restart
sudo /etc/init.d/php5-fpm restart
## todo update apparmor for load infile support

## Install packages needed for UI tests (fonts + phantomjs 1.9.8, tests do not work with the PhantomJS version provided by Ubuntu)
sudo add-apt-repository "deb http://us-east-1.ec2.archive.ubuntu.com/ubuntu/ trusty multiverse"
sudo add-apt-repository "deb-src http://us-east-1.ec2.archive.ubuntu.com/ubuntu/ trusty multiverse"
sudo add-apt-repository "deb http://us-east-1.ec2.archive.ubuntu.com/ubuntu/ trusty-updates multiverse"
sudo add-apt-repository "deb-src http://us-east-1.ec2.archive.ubuntu.com/ubuntu/ trusty-updates multiverse"
sudo apt-get update
sudo apt-get install ttf-mscorefonts-installer
sudo apt-get install ttf-mscorefonts-installer

cd /usr/local/share/
sudo wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2
sudo tar xjf phantomjs-1.9.8-linux-x86_64.tar.bz2
sudo ln -s /usr/local/share/phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/local/share/phantomjs
sudo ln -s /usr/local/share/phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
sudo ln -s /usr/local/share/phantomjs-1.9.8-linux-x86_64/bin/phantomjs /usr/bin/phantomjs
cd
2 changes: 0 additions & 2 deletions puppet/modules/piwik/manifests/base.pp
Expand Up @@ -41,8 +41,6 @@

package { 'wget': ensure => latest, require => Exec['base_apt-get_update'] }

package { 'phantomjs': ensure => latest, require => Exec['base_apt-get_update'] }

package { 'curl': ensure => latest, require => Exec['base_apt-get_update'] }

package { 'cutycapt': ensure => latest, require => Exec['base_apt-get_update'] }
Expand Down

0 comments on commit 1370525

Please sign in to comment.