Merge branch 'develop'

Author: Benjamin Calef

README.md

@@ -146,7 +146,7 @@ Those provisions will be executed on pre-defined sequences:
 ### Permission
 Magento file system owner is configured for ``vagrant`` user, it means all commands in magento project must be executed by this user.<br>
 By default command line ``vagrant ssh`` will log you as vagrant user.<br>
-* To re-apply magento permission you can run ``permission`` in command line: this is only applicable for ``app`` path or ``default`` mount configurations.
+* To re-apply magento permissions you can run ``permission`` directly in command line.
 
 ### Command line
 * magento (Magento CLI for your project)

provision/100-magento-pre.sh

@@ -44,15 +44,13 @@ ln -sfn /etc/nginx/sites-available/010-"$PROJECT_NAME" /etc/nginx/sites-enabled/
 
 # Permission script
 cat <<-EOF > /home/vagrant/permission.bak
-if [ "$PROJECT_MOUNT" != "nfs" ] || [ "$PROJECT_MOUNT_PATH" == "app" ]; then
 echo 'Applying permissions to $PROJECT_PATH'
 cd "$PROJECT_PATH" \\
 && sudo find var vendor pub/static pub/media app/etc -type f -exec chmod g+w {} \; \\
 && sudo find var vendor pub/static pub/media app/etc -type d -exec chmod g+ws {} \; \\
 && sudo find ./var ./generated -type d -exec chmod 777 {} \; \\
 && sudo chmod u+x bin/magento \\
 && sudo chown -fR :www-data . || :
-fi
 EOF
 grep '[^[:blank:]]' < /home/vagrant/permission.bak > /usr/local/bin/permission
 rm -rf /home/vagrant/permission.bak