From e7469af28428ab9016dbf41ca6cdc3904dfe3521 Mon Sep 17 00:00:00 2001 From: Thibaud Fabre Date: Fri, 17 Apr 2015 09:59:23 +0200 Subject: [PATCH 1/2] Use correct script for API location --- .../vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp b/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp index a9fcccfb3e..c745eb1e67 100644 --- a/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp +++ b/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp @@ -805,7 +805,7 @@ define nginx_vhost ( vhost => $server_name, www_root => $www_root, location_cfg_append => { - rewrite => '^(.*)$ /index.php/$1 last' + rewrite => '^(.*)$ /api.php/$1 last' } } From 28655ecbda6459825946f33b633abbfe294f8b2b Mon Sep 17 00:00:00 2001 From: Thibaud Fabre Date: Fri, 17 Apr 2015 10:04:02 +0200 Subject: [PATCH 2/2] Rename resources --- .../vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp b/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp index c745eb1e67..7a549bb307 100644 --- a/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp +++ b/resources/vagrant/vms/phraseanet-php55-nginx/puphpet/puppet/manifest.pp @@ -789,7 +789,7 @@ define nginx_vhost ( 'include' => 'fastcgi_params' }, $fastcgi_pass_hash) - nginx::resource::location { "${server_name}-php": + nginx::resource::location { "${server_name}-index": ensure => present, location => '@rewriteapp', vhost => $server_name, @@ -799,7 +799,7 @@ define nginx_vhost ( } } - nginx::resource::location { "${server_name}-php1": + nginx::resource::location { "${server_name}-api": ensure => present, location => '/api', vhost => $server_name, @@ -809,7 +809,7 @@ define nginx_vhost ( } } - nginx::resource::location { "${server_name}-php2": + nginx::resource::location { "${server_name}-php": ensure => present, location => '~ ^/(index|index_dev|api)\.php(/|$)', vhost => $server_name,