- Guest configs editable from IDE (#29)

- Added ability to choose if PhpStorm configs should be removed during project reinitialization

Author: Alexander Paliarush

CHANGELOG.md

@@ -23,6 +23,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
  - Added host wrapper script for bin/magento command on guest
  - Added ability to modify guest config files (PHP, Apache etc) directly from host IDE
+ - Added ability to choose if PhpStorm configs should be removed during project reinitialization
 
 ## [v2.0.0] - 2016-02-05
 
@@ -52,18 +53,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
- - Integrated vagrant host manager plugin to allow automatic /etc/hosts update 
- - Added support of EE linked to CE using symlinks on *nix hosts 
+ - Integrated vagrant host manager plugin to allow automatic /etc/hosts update
+ - Added support of EE linked to CE using symlinks on *nix hosts
  - Added ${MAGENTO_ROOT} environment variable, which stores installation path on the guest
  - Added support of Rabbit MQ
- - Added possibility to specify tokens for repo.magento.com composer repository 
+ - Added possibility to specify tokens for repo.magento.com composer repository
  - git is now installed on guest machine
- - Removed 'magento' MySQL user, password of 'root' user removed 
- - Database for integration tests are created by default 
- - Added script for clearing Magento cache from host command line 
+ - Removed 'magento' MySQL user, password of 'root' user removed
+ - Database for integration tests are created by default
+ - Added script for clearing Magento cache from host command line
  - Configured XDebug to allow remote debugging
- - Fixed max_nesting_level issue with XDebug enabled  
+ - Fixed max_nesting_level issue with XDebug enabled
  - Apache is run by 'vagrant' user
- - Enabled Magento cron jobs 
+ - Enabled Magento cron jobs
  - Enabled XDebug by default
  - Created vagrant configuration for Magneto 2 CE developer's environment installation

README.md

@@ -213,7 +213,7 @@ Answer can be found [here](https://github.com/paliarush/magento2-vagrant-for-dev
 
 ### Accessing PHP and other config files
 
-It is possible to view/modify majority of guest machine config files directly from IDE on the host. They will be accessible in [etc/guest](etc/guest) directory only when guest machine is running. The list of accessible configs includes, but not limited to: PHP, Apache, Mysql, Varnish, RabbitMQ, hosts, cron.
+It is possible to view/modify majority of guest machine config files directly from IDE on the host. They will be accessible in [etc/guest](etc/guest) directory only when guest machine is running. The list of accessible configs includes: PHP, Apache, Mysql, Varnish, RabbitMQ.
 Do not edit any symlinks using PhpStorm because it may break your installation.
 
 After editing configs in IDE it is still required to restart related services manually.
@@ -240,3 +240,11 @@ Go to 'vagrant-magento' created earlier and run in command line:
 ```
 bash init_project.sh -fc
 ```
+
+To reset PhpStorm project configuration, in addition to `-f` specify `-p` option:
+
+```
+bash init_project.sh -fp
+OR
+bash init_project.sh -fcp
+```

init_project.sh

@@ -37,10 +37,12 @@ rm -f "${config_path}.back"
 # Clean up the project before initialization if "-f" option was specified. Remove codebase if "-fc" is used.
 force_project_cleaning=0
 force_codebase_cleaning=0
-while getopts 'fc' flag; do
+force_phpstorm_config_cleaning=0
+while getopts 'fcp' flag; do
   case "${flag}" in
     f) force_project_cleaning=1 ;;
     c) force_codebase_cleaning=1 ;;
+    p) force_phpstorm_config_cleaning=1 ;;
     *) error "Unexpected option ${flag}" ;;
   esac
 done
@@ -82,10 +84,12 @@ vagrant up
 
 set +x
 echo "Configuring PhpStorm..."
-if [ ${force_project_cleaning} -eq 1 ]; then
-    rm -rf ${vagrant_dir}/.idea/*
+if [ ${force_project_cleaning} -eq 1 ] && [ ${force_phpstorm_config_cleaning} -eq 1 ]; then
+    rm -rf ${vagrant_dir}/.idea
+fi
+if [ ! "$(ls -A ${vagrant_dir}/.idea)" ]; then
+    bash "${vagrant_dir}/scripts/host/configure_php_storm.sh"
 fi
-bash "${vagrant_dir}/scripts/host/configure_php_storm.sh"
 
 bold=$(tput bold)
 regular=$(tput sgr0)

scripts/guest/link_configs

@@ -19,15 +19,19 @@ function process_configs () {
 # Enable trace printing and exit on the first error
 set -ex
 
+# Below configuration is required to allow managing mysql as a service
+if ! cat /etc/apparmor.d/local/usr.sbin.mysqld | grep -q '/vagrant/etc/guest' ; then
+    echo "
+        /vagrant/etc/guest/mysql/*.pem r,
+        /vagrant/etc/guest/mysql/conf.d/ r,
+        /vagrant/etc/guest/mysql/conf.d/* r,
+        /vagrant/etc/guest/mysql/*.cnf r," >> /etc/apparmor.d/local/usr.sbin.mysqld
+fi
+
 # Make guest configs visible and editable in the host IDE
 
 # Configs located under /etc/*
 config_dir="/etc"
 # See unlink_configs script
-configs=( apache2 php mysql varnish rabbitmq crontab cron.d timezone hosts profile profile.d )
+configs=( apache2 php mysql varnish rabbitmq )
 process_configs ${config_dir} ${configs}
-
-# Configs located under ~/*
-config_dir="/home/vagrant"
-configs=( .bashrc .composer .profile )
-process_configs ${config_dir} ${configs}

scripts/guest/unlink_configs

@@ -23,10 +23,5 @@ set -ex
 # Configs located under /etc/*
 config_dir="/etc"
 # See link_configs script
-configs=( apache2 php mysql varnish rabbitmq crontab cron.d timezone hosts profile profile.d )
-process_configs ${config_dir} ${configs}
-
-# Configs located under ~/*
-config_dir="/home/vagrant"
-configs=( .bashrc .composer .profile )
+configs=( apache2 php mysql varnish rabbitmq )
 process_configs ${config_dir} ${configs}