Upgrade php from 5.4.* to 5.5.*

resources/vagrant/vms/phraseanet-php55-nginx/puphpet/config.yaml

@@ -1,10 +1,10 @@
 ---
 vagrantfile-local:
-    name: phraseanet-php54-nginx
+    name: phraseanet-php55-nginx
     vm:
         box: puphpet/debian75-x64
         box_url: puphpet/debian75-x64
-        hostname: phraseanet-php54-nginx
+        hostname: phraseanet-php55-nginx
         memory: '4096'
         cpus: '2'
         chosen_provider: virtualbox
@@ -26,12 +26,12 @@ vagrantfile-local:
                 cpus: 1
         provision:
             puppet:
-                manifests_path: resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet
+                manifests_path: resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet
                 manifest_file: manifest.pp
-                module_path: resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/modules
+                module_path: resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/modules
                 options:
                     - '--verbose'
-                    - '--hiera_config /vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/puppet/hiera.yaml'
+                    - '--hiera_config /vagrant/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/hiera.yaml'
                     - '--parser future'
         synced_folder:
             KaPfJ4CzfgFk:
@@ -57,68 +57,67 @@ vagrantfile-local:
         host: detect
 server:
     packages:
-        - imagemagick
-        - libevent-dev
-        - ufraw
-        - ghostscript
-        - xpdf
-        - unoconv
-        - gpac
-        - swftools
-        - openjdk-7-jre
-        - openjdk-7-jdk
-        - locales
-        - libmariadbclient-dev
-        - pkg-config
-        - libzmq-dev
-        - libxml2-dev
-        - libexpat1-dev
-        - libzmq3-dev
-        - re2c
-        - scons
-        - inkscape
-        - python-setuptools
-        - libmemcache0
-        - libimage-exiftool-perl
-        - git
-        - libfreetype6-dev
-        - libgif-dev
-        - libjpeg62-dev
-        - cachefilesd
         - autoconf
         - automake
         - build-essential
+        - cachefilesd
+        - ghostscript
+        - git
+        - gpac
+        - htop
+        - imagemagick
+        - inkscape
         - libass-dev
+        - libdc1394-22-dev
+        - libevent-dev
+        - libexpat1-dev
+        - libfaad-dev
         - libfreetype6-dev
+        - libgif-dev
         - libgpac-dev
+        - libgsm1-dev
+        - libimage-exiftool-perl
+        - libjpeg62-dev
+        - libmariadbclient-dev
+        - libmemcache0
+        - libmp3lame-dev
+        - libopencore-amrnb-dev
+        - libopencore-amrwb-dev
+        - libopus-dev
         - libsdl1.2-dev
         - libtheora-dev
         - libtool
         - libva-dev
         - libvdpau-dev
         - libvorbis-dev
-        - libx11-dev
-        - libxext-dev
-        - libx264-dev
-        - libxfixes-dev
-        - libgsm1-dev
-        - pkg-config
-        - texi2html
-        - zlib1g-dev
-        - yasm
-        - unzip
-        - libopus-dev
-        - libvpx-dev
         - libvorbis-dev
-        - libmp3lame-dev
+        - libvpx-dev
+        - libx11-dev
+        - libx264-dev
+        - libxext-dev
+        - libxfixes-dev
+        - libxml2-dev
         - libxvidcore-dev
-        - libfaad-dev
+        - libzmq-dev
-        - libopencore-amrnb-dev
+        - libzmq3-dev
-        - libopencore-amrwb-dev
+        - locales
-        - libxvidcore-dev
-        - libdc1394-22-dev
         - memcached
+        - openjdk-7-jdk
+        - openjdk-7-jre
+        - pkg-config
+        - python-setuptools
+        - re2c
+        - scons
+        - swftools
+        - texi2html
+        - ufraw
+        - unoconv
+        - unzip
+        - vim
+        - xpdf
+        - yasm
         - zip
+        - zlib1g-dev
     dot_files:
         -
             bash_aliases: null
@@ -183,9 +182,9 @@ nginx:
         proxy_buffers: '4 256k'
     vhosts:
         issDOx17O4bn:
-            server_name: phraseanet-php54-nginx
+            server_name: phraseanet-php55-nginx
             server_aliases:
-                - nginx.phraseanet.php54
+                - nginx.phraseanet.php55
             www_root: /var/www/phraseanet/www
             listen_port: '80'
             index_files:
@@ -200,30 +199,30 @@ nginx:
             ssl_key: ''
 php:
     install: '1'
-    version: '54'
+    version: '55'
     composer: '1'
     composer_home: ''
     modules:
         php:
             - cli
+            - curl
+            - enchant
+            - gd
+            - imagick
             - intl
+            - mbstring
             - mcrypt
             - memcache
             - memcached
-            - curl
-            - gd
-            - imagick
-            - enchant
             - mysql
-            - mbstring
-            - sqlite
             - redis
+            - sqlite
         pear: {  }
         pecl:
-            - zip
-            - json
             - amqp
-            - APC
+            - json
+            - zip
+            - zmq-beta
     ini:
         display_errors: On
         error_reporting: '-1'

resources/vagrant/vms/phraseanet-php55-nginx/puphpet/files/exec-once/setup

@@ -83,8 +83,9 @@ phpize
 ./configure
 make
 sudo make install
-sudo sh -c 'echo "extension=twig.so" > /etc/php5/cli/conf.d/twig.ini'
+sudo sh -c 'echo "extension=twig.so" > /etc/php5/mods-available/twig.ini'
-sudo sh -c 'echo "extension=twig.so" > /etc/php5/fpm/conf.d/twig.ini'
+sudo sh -c 'ln -s ../../mods-available/twig.ini /etc/php5/cli/conf.d/20-twig.ini'
+sudo sh -c 'ln -s ../../mods-available/twig.ini /etc/php5/fpm/conf.d/20-twig.ini'
 
 # swftools
 cd /tmp
@@ -95,22 +96,6 @@ cd swftools-0.9.2
 make
 sudo make install
 
-# zmq php extension
-yes | sudo pecl install zmq-beta
-if [ $? -eq 0 ]; then
-    sudo sh -c 'echo "extension=zmq.so" > /etc/php5/cli/conf.d/zmq.ini'
-    sudo sh -c 'echo "extension=zmq.so" > /etc/php5/fpm/conf.d/zmq.ini'
-fi
-
-# libevent php extension
-sudo apt-get autoremove --yes --purge libevent-dev
-sudo apt-get install --yes libevent-dev
-yes | sudo pecl install libevent-beta
-if [ $? -eq 0 ]; then
-    sudo sh -c 'echo ";extension=libevent.so" > /etc/php5/cli/conf.d/libevent.ini'
-    sudo sh -c 'echo ";extension=libevent.so" > /etc/php5/fpm/conf.d/libevent.ini'
-fi
-
 # cache file sd
 sudo sh -c 'echo "RUN=yes" > /etc/default/cachefilesd'
 
@@ -141,4 +126,4 @@ sudo service nginx restart
 sudo service iptables-persistent stop
 
 # reload bash
-source ~/.bashrc
+source ~/.bashrc

resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/hiera.yaml

@@ -1,7 +1,7 @@
 ---
 :backends: yaml
 :yaml:
-    :datadir: '/vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet'
+    :datadir: '/vagrant/resources/vagrant/vms/phraseanet-php55-nginx/puphpet'
 :hierarchy:
     - config
 :logger: console

resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp

@@ -40,10 +40,10 @@ file { "/home/${::ssh_username}":
 # copy dot files to ssh user's home directory
 exec { 'dotfiles':
   cwd     => "/home/${::ssh_username}",
-  command => "cp -r /vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.[a-zA-Z0-9]* /home/${::ssh_username}/ \
+  command => "cp -r /vagrant/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/files/dot/.[a-zA-Z0-9]* /home/${::ssh_username}/ \
               && chown -R ${::ssh_username} /home/${::ssh_username}/.[a-zA-Z0-9]* \
-              && cp -r /vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot/.[a-zA-Z0-9]* /root/",
+              && cp -r /vagrant/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/files/dot/.[a-zA-Z0-9]* /root/",
-  onlyif  => 'test -d /vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/files/dot',
+  onlyif  => 'test -d /vagrant/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/files/dot',
   returns => [0, 1],
   require => User[$::ssh_username]
 }
@@ -372,7 +372,7 @@ if is_hash($firewall_values['rules']) and count($firewall_values['rules']) > 0 {
 ## Begin Apache manifest
 
 if $yaml_values == undef {
-  $yaml_values = loadyaml('/vagrant/resources/vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml')
+  $yaml_values = loadyaml('/vagrant/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/config.yaml')
 } if $apache_values == undef {
   $apache_values = $yaml_values['apache']
 } if $php_values == undef {