Merge pull request #22 from greboid/master

Fix nginx-php-site role.
Fix nginx-upstream-site role