salt/databases/phpmyadmin/etc/nginx/admin.d/phpmyadmin.conf in salted-rails-0.0.6 vs salt/databases/phpmyadmin/etc/nginx/admin.d/phpmyadmin.conf in salted-rails-0.0.7

- old
+ new

@@ -1,24 +1,27 @@ -yerver { - listen 80; - server_name phpmyadmin; - client_max_body_size 20M; location /phpmyadmin { root /usr/share/; index index.php index.html index.htm; location ~ ^/phpmyadmin/(.+\.php)$ { try_files $uri =404; root /usr/share/; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include /etc/nginx/fastcgi_params; + + fastcgi_split_path_info ^(.+\.php)(/.+)$; + # # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini + # + # # With php5-cgi alone: + # fastcgi_pass 127.0.0.1:9000; + # # With php5-fpm: + fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_index index.php; + #include fastcgi_params; } location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { root /usr/share/; } } -}