Merge branch 'release-0.10.7'

Author: Daryl Lozupone

.gitignore

@@ -1,11 +1,13 @@
 .idea
 
+/sql/*
+!/sql/default.sql
+
 IP
 .vagrant
 /www/*
 !/www/content/
 /www/content/*
 !/www/content/mu-plugins
 /www/content/mu-plugins/*
-
 /wp-tests/

FAQ.md

@@ -99,6 +99,7 @@ If you cannot create a `scripts/` directory in the same directory as your `Vagra
 `wplib-scripts/` — and then search for `scripts/` in your `Vagrantfile` and replace it with whatever you named your directory, e.g. 
 with `wplib-scripts/` as in our example.
 
+<<<<<<< HEAD
 <a id="existing-projects"></a>
 ### How do I Configure Composer to Work with WPLib Box?
 Configure `composer.json` however you like; WPLib Box is agnostic with respect to Composer. 
@@ -118,11 +119,17 @@ This can be accomplished by connecting to the guest machine via ssh:
 Change the pertinent line. Press `CTRL-X` to exit the program. When prompted to save the buffer, press `ENTER`. The filename will appear. Press `ENTER` again. Then enter the command `sudo service nginx restart`.
 Visit [http://wplib.box/phpinfo.php](http://wplib.box/phpinfo.php) (or whatever domain name you have configured for the box) to verify.
 
+## How do I share my work with the outside world?
+
+The box image has [localtunnel.me](https://localtunnel.me) pre-installed in the box. You can simply `ssh` into the guest and run: `lt --port 80`.
+This will provide you with a URL to share the local site until you exit the command by either terminating the program or shutting down the machine.
+
+You can also use [Vagrant Share](https://www.vagrantup.com/docs/share).
+
 ##Glossary 
 <a id="glossary"></a>
 
 ###What Do All These Terms Mean?
-=======
 
 The following are terms we have decide to use in our FAQ and in other documents.  If any of these terms conflict with broader industry terms please submit a pull request with any suggested corrects. 
 

README.md

@@ -20,12 +20,15 @@ We think that once you try WPLib Box you will agree that we have succeeded.  Wan
 
 Service/Software|Version
 -------|----------
-PHP-FPM|5.6.20 && 7.0
+PHP/PHP-FPM|5.6.20 & 7.0
 MySQL|5.5
 nginx|1.4
 XDEBUG|2.3.3
 Redis|2.8.4
 WP CLI|0.23.0
+Nodejs|
+Gearman
+localtunnel.me
 
 ## Supported Host/Development Computers
 This box was developed using Mac OS/X and tested using Linux and Windows with [git-bash](https://git-for-windows.github.io/). Thus we believe it currently works with:
@@ -176,6 +179,10 @@ Password                      | `vagrant`
 
 Instructions to come...
 
+## Internet Sharing
+
+Internet sharing is implemented with [localtunnel.me](https://localtunnel.me), which is pre-installed in the box image.
+
 ##How?
 
 How have we been able to make **WPLib Box** the:

Vagrantfile

@@ -266,5 +266,9 @@ Vagrant.configure(2) do |config|
 
     config.vm.provision "shell", path: "scripts/provision.sh"
 
+    config.trigger.before :halt do
+        run_remote "mkdir -p /vagrant/sql && mysqldump -u wordpress -pwordpress wordpress > /vagrant/sql/current.sql"
+    end
+
 end
 

scripts/provision.sh

@@ -3,12 +3,6 @@
 # WPLib Box provision script
 #
 
-#
-# Import default database from /sql/default.sql
-#
-
-mysql -u root wordpress < /vagrant/sql/default.sql
-
 #
 # Symlink the Object Cache Drop-in for Redis, if not already symlinked
 #

scripts/watchers/README.md

@@ -0,0 +1,4 @@
+# File Watchers (On-change scripts)
+
+Files placed in this directory will be run whenever files in the `www` directory change. The files
+in this directory are expected to be either Bash scripts or PHP.