refs #3314 nginx.piwik:8080 is now fully working with nginx and php-fpm. piwik installation works

git-svn-id: http://dev.piwik.org/svn/trunk@6759 59fd770c-687e-43c8-a1e3-f5a4ff64c105

misc/deploy/puppet/init.pp

@@ -19,8 +19,6 @@ package {
         ensure => latest;
     'wget':
         ensure => latest;
-    'python-software-properties':
-        ensure => installed;
 }
 
 include git

misc/deploy/puppet/nodes.pp

-host {
-    "piwik.local":
-        ip      => "127.0.0.1";
-} 
 
-$piwik_domain = 'piwik.local'
+$piwik_domain = 'nginx.piwik'
 $piwik_path   = '/var/www/piwik'
+$piwik_port   = 80
 $socket_path  = "${piwik_path}/tmp/fpm.socket"
 
+host {
+    "${piwik_domain}":
+        ip      => "127.0.0.1";
+} 
+
 user { $piwik_domain:
   ensure  => present,
   comment => $piwik_domain,
@@ -40,7 +42,7 @@ node default {
   nginx::resource::vhost { "${piwik_domain}":
     ensure   => present,
     www_root => $piwik_path,
-    listen_port => 8001,
+    listen_port => 8080,
     locations => $php_locations
   }
 }

misc/deploy/puppet/php-piwik.pp

 include php
 
 php::module { ['snmp', 'xdebug', 'mysql', 'gd', 'sqlite', 'memcache', 'mcrypt', 'imagick', 'geoip', 'uuid', 'recode', 'cgi']:
-}
\ No newline at end of file
+  notify => Class['php::fpm::service'],
+}
+
+file { "/etc/php5/conf.d/pdo.ini":
+  content => "extension=pdo.so",
+  notify => Class['php::fpm::service'],
+}
+
+file { "/etc/php5/conf.d/pdo_mysql.ini":
+  content => "extension=pdo_mysql.so",
+  notify => Class['php::fpm::service'],
+}
+
+file { "/etc/php5/conf.d/mysqli.ini":
+  content => "extension=mysqli.so",
+  notify => Class['php::fpm::service'],
+}
+
+# TODO replace above files with php::conf
+# php::conf { [ 'pdo' ]:
+#   content => 'extension=pdo.so',
+#   notify => Class['php::fpm::service'],
+# }
+# php::conf { [ 'pdo_mysql' ]:
+#   content => 'extension=pdo_mysql.so',
+#   notify => Class['php::fpm::service'],
+# }
+# php::conf { [ 'mysqli' ]:
+#   content => 'extension=mysqli.so',
+#   notify => Class['php::fpm::service'],
+# }
\ No newline at end of file

misc/deploy/vagrant/precise64/Vagrantfile

@@ -31,8 +31,6 @@ Vagrant::Config.run do |config|
   # Forward a port from the guest to the host, which allows for outside
   # computers to access the VM, whereas host only networking does not.
   # config.vm.forward_port 80, 8080
-  config.vm.forward_port 80, 8080
-  config.vm.forward_port 8000, 8001
 
   # Share an additional folder to the guest VM. The first argument is
   # an identifier, the second is the path on the guest to mount the