ericmann · richpav · Aug 16, 2014 · Aug 16, 2014 · Aug 16, 2014 · Aug 16, 2014
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,23 @@
+# vvv-apache-nfs-pagespeed-mod_proxy_fcgi Changelog
+
+### 1.1.0
+* mod_proxy_fcgi is really working now.
+* ack-2.14
+* phpMyAdmin-4.2.9
+* Latest updates from VVV
+
+### 1.0.1
+* Added Sexy bash prompt
+* Removed APC configs.
+* mod_proxy_fcgi replaces FastCGI (mod_fastcgi.c)
+* Incorporated latest VVV updates
+
+### 1.0
+* Updated to Ubuntu 14.04.01 x64, ergo Apache 2.4 and no more APC.
+* Added Google PageSpeed.
+* Shares mounted with NFS
+* Added some php5-fpm-config files from Apache-VVV that I overlooked.
+
 # Varying Vagrant Vagrants Changelog
 
 ## 1.0.1

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,37 @@
+# Contributing to VVV
+
+Contributions to the VVV project are more than welcome.
+
+## License
+
+By contributing code to the [VVV project](https://github.com/varying-vagrant-vagrants/vvv/), you agree to license your contribution under the [MIT License](https://github.com/varying-vagrant-vagrants/vvv/blog/master/LICENSE).
+
+## Issues
+
+Open a GitHub issue for anything. We've covered quite a bit of ground through the first year, so it would be helfpul to search for related topics first. That said, don't worry if you find yourself opening something that sounds like it could be obvious. There is no such thing.
+
+## Comments
+
+Comment on any GitHub issue, open or closed. The only guidelines here are to be friendly and welcoming. If you see that a question has been asked and you think you know the answer, don't wait!
+
+## Pull Requests
+
+Submit a pull request at any time, whether an issue has been created or not. It may be helpful to discuss your goals in an issue first, though many things can best be shown with code.
+
+We do ask that the pull request be submitted against the current **master** branch. Every effort is made to make the pull request as stable as possible before merging it in, so we aren't too worried. A list of stable releases is maintained as we go and can be used by anyone concerned by ongoing development.
+
+It may make sense that a feature branch is created so that several contributors can work together. In this case, it is possible that write access to the VVV repository will be given liberally. You may be asked to submit your pull request against a feature branch so that it can be merged and worked on with others before going in to master.
+
+## Milestones and Labels
+
+Some loose organization has grown around milestones and labels. We'll often have the next two versions listed for selection as a milestone. Things like bugs, enhancements, docs, etc... are listed as labels.
+
+## Code Style
+
+### Bash Scripting
+
+For any shell scripting that we do in Bash — see `provision.sh` — we try to follow the style provided in Google's [Shell Style Guide](http://google-styleguide.googlecode.com/svn/trunk/shell.xml).
+
+### PHP
+
+For any PHP, we try to follow the WordPress core [code standards](http://make.wordpress.org/core/handbook/coding-standards/).
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 the contributors of the VVV project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/README.md b/README.md
diff --git a/Vagrantfile b/Vagrantfile
@@ -12,7 +12,9 @@ Vagrant.configure("2") do |config|
 
   # Configurations from 1.0.x can be placed in Vagrant 1.1.x specs like the following.
   config.vm.provider :virtualbox do |v|
-    v.customize ["modifyvm", :id, "--memory", 512]
+    v.customize ["modifyvm", :id, "--memory", 1024]
+    v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+    v.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
   end
 
   # Forward Agent
@@ -23,11 +25,10 @@ Vagrant.configure("2") do |config|
 
   # Default Ubuntu Box
   #
-  # This box is provided by Vagrant at vagrantup.com and is a nicely sized (290MB)
-  # box containing the Ubuntu 12.0.4 Precise 32 bit release. Once this box is downloaded
+  # This box is provided by Ubuntu vagrantcloud.com and is a nicely sized (332MB)
+  # box containing the Ubuntu 14.04 Trusty 64 bit release. Once this box is downloaded
   # to your host computer, it is cached for future use under the specified box name.
-  config.vm.box = "precise32"
-  config.vm.box_url = "http://files.vagrantup.com/precise32.box"
+  config.vm.box = "ubuntu/trusty64"
 
   config.vm.hostname = "vvv"
 
@@ -81,6 +82,10 @@ Vagrant.configure("2") do |config|
   # for those as well. This includes other Vagrant boxes.
   config.vm.network :private_network, ip: "192.168.50.4"
 
+  # NFS configuration
+  config.nfs.map_uid = Process.uid
+  config.nfs.map_gid = Process.gid
+
   # Drive mapping
   #
   # The following config.vm.synced_folder settings will map directories in your Vagrant
@@ -96,11 +101,20 @@ Vagrant.configure("2") do |config|
   # a mapped directory inside the VM will be created that contains these files.
   # This directory is used to maintain default database scripts as well as backed
   # up mysql dumps (SQL files) that are to be imported automatically on vagrant up
-  config.vm.synced_folder "database/", "/srv/database"
-  if vagrant_version >= "1.3.0"
-    config.vm.synced_folder "database/data/", "/var/lib/mysql", :mount_options => [ "dmode=777", "fmode=777" ]
-  else
-    config.vm.synced_folder "database/data/", "/var/lib/mysql", :extra => 'dmode=777,fmode=777'
+  config.vm.synced_folder "database/", "/srv/database", type: "nfs"
+
+  # If the mysql_upgrade_info file from a previous persistent database mapping is detected,
+  # we'll continue to map that directory as /var/lib/mysql inside the virtual machine. Once
+  # this file is changed or removed, this mapping will no longer occur. A db_backup command
+  # is now available inside the virtual machine to backup all databases for future use. This
+  # command is automatically issued on halt, suspend, and destroy if the vagrant-triggers
+  # plugin is installed.
+  if File.exists?(File.join(vagrant_dir,'database/data/mysql_upgrade_info')) then
+    if vagrant_version >= "1.3.0"
+      config.vm.synced_folder "database/data/", "/var/lib/mysql", type: "nfs"
+    else
+      config.vm.synced_folder "database/data/", "/var/lib/mysql", type: "nfs"
+    end
   end
 
   # /srv/config/
@@ -109,17 +123,23 @@ Vagrant.configure("2") do |config|
   # a mapped directory inside the VM will be created that contains these files.
   # This directory is currently used to maintain various config files for php and
   # Apache as well as any pre-existing database files.
-  config.vm.synced_folder "config/", "/srv/config"
+  config.vm.synced_folder "config/", "/srv/config", type: "nfs"
+
+  # /srv/log/
+  #
+  # If a log directory exists in the same directory as your Vagrantfile, a mapped
+  # directory inside the VM will be created for some generated log files.
+  config.vm.synced_folder "log/", "/srv/log", type: "nfs"
 
   # /srv/www/
   #
   # If a www directory exists in the same directory as your Vagrantfile, a mapped directory
-  # inside the VM will be created that acts as the default location for Apache sites. Put all
+  # inside the VM will be created that acts as the default location for nginx sites. Put all
   # of your project files here that you want to access through the web server
   if vagrant_version >= "1.3.0"
-    config.vm.synced_folder "www/", "/srv/www/", :owner => "www-data", :mount_options => [ "dmode=775", "fmode=774" ]
+    config.vm.synced_folder "www/", "/srv/www/", type: "nfs"
   else
-    config.vm.synced_folder "www/", "/srv/www/", :owner => "www-data", :extra => 'dmode=775,fmode=774'
+    config.vm.synced_folder "www/", "/srv/www/", type: "nfs"
   end
 
   # Customfile - POSSIBLY UNSTABLE
@@ -164,4 +184,31 @@ Vagrant.configure("2") do |config|
   if File.exists?(File.join(vagrant_dir,'provision','provision-post.sh')) then
     config.vm.provision :shell, :path => File.join( "provision", "provision-post.sh" )
   end
+
+  # Always start MySQL on boot, even when not running the full provisioner
+  # (run: "always" support added in 1.6.0)
+  if vagrant_version >= "1.6.0"
+    config.vm.provision :shell, inline: "sudo service mysql restart", run: "always"
+  end
+
+  # Vagrant Triggers
+  #
+  # If the vagrant-triggers plugin is installed, we can run various scripts on Vagrant
+  # state changes like `vagrant up`, `vagrant halt`, `vagrant suspend`, and `vagrant destroy`
+  #
+  # These scripts are run on the host machine, so we use `vagrant ssh` to tunnel back
+  # into the VM and execute things. By default, each of these scripts calls db_backup
+  # to create backups of all current databases. This can be overridden with custom
+  # scripting. See the individual files in config/homebin/ for details.
+  if defined? VagrantPlugins::Triggers
+    config.trigger.before :halt, :stdout => true do
+      run "vagrant ssh -c 'vagrant_halt'"
+    end
+    config.trigger.before :suspend, :stdout => true do
+      run "vagrant ssh -c 'vagrant_suspend'"
+    end
+    config.trigger.before :destroy, :stdout => true do
+      run "vagrant ssh -c 'vagrant_destroy'"
+    end
+  end
 end
diff --git a/config/apache-config/apache2.conf b/config/apache-config/apache2.conf
@@ -53,7 +53,7 @@ ServerName localhost
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
 #
-LockFile ${APACHE_LOCK_DIR}/accept.lock
+Mutex file:${APACHE_LOCK_DIR} default
 
 #
 # PidFile: The file in which the server should record its process
@@ -211,9 +211,6 @@ LogLevel warn
 Include mods-enabled/*.load
 Include mods-enabled/*.conf
 
-# Include all the user configurations:
-Include httpd.conf
-
 # Include ports listing
 Include ports.conf
 

diff --git a/config/apache-config/php5-fpm.conf b/config/apache-config/php5-fpm.conf
diff --git a/config/apache-config/sites/wordpress-default.conf b/config/apache-config/sites/wordpress-default.conf
@@ -14,7 +14,22 @@
 #       - SVN repository of WordPress trunk
 #       - Files available locally in this repository's www/wordpress-trunk
 #       - Files available on guest (vagrant ssh) in /srv/www/wordpress-trunk
-#
+#   http://src.wordpress-develop.dev
+#   http://build.wordpress-develop.dev
+
+# Got the idea from here: http://gregrickaby.com/wordpress-with-apache-2-4-and-php-5-5/
+<Directory "/srv/www/">
+Order allow,deny
+Allow from all
+Require all granted
+AllowOverride All
+Options All
+</Directory>
+
+# TODO: Which is better, Options ALL or Options +Indexes
+# TODO: VirtualDocumentRoot /Users/daddy/Copy/WordpressDev/vhosts/%0
+# TODO: Each vhost has its own set of access & error logs
+# TODO: Which is better, AllowOverride All or AllowOverride FileInfo All?
 
 ################################################################
 # Default Apache catch-all server
@@ -26,6 +41,7 @@
 <VirtualHost *:80>
 	DocumentRoot /srv/www/default
 	ServerName vvv.dev
+	ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/default/$1
 </VirtualHost>
 
 ################################################################
@@ -38,6 +54,7 @@
 <VirtualHost *:80>
 	DocumentRoot /srv/www/wordpress-default
 	ServerName local.wordpress.dev
+	ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/wordpress-default/$1
 </VirtualHost>
 
 ################################################################
@@ -50,6 +67,7 @@
 <VirtualHost *:80>
 	DocumentRoot /srv/www/wordpress-trunk
 	ServerName local.wordpress-trunk.dev
+	ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/wordpress-trunk/$1
 </VirtualHost>
 
 ################################################################
@@ -62,6 +80,7 @@
 <VirtualHost *:80>
 	DocumentRoot /srv/www/wordpress-develop/src
 	ServerName src.wordpress-develop.dev
+	ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/wordpress-develop/src/$1
 </VirtualHost>
 
 ################################################################
@@ -74,4 +93,5 @@
 <VirtualHost *:80>
 	DocumentRoot /srv/www/wordpress-develop/build
 	ServerName build.wordpress-develop.dev
-</VirtualHost>
+	ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/wordpress-develop/build/$1
+</VirtualHost>
diff --git a/config/apt-source-append.list b/config/apt-source-append.list
@@ -1,18 +1,9 @@
 # Additional sources will be added here to help control the
 # versions of various packages that are installed
 
-# Provides SVN 1.7.9
-deb http://ppa.launchpad.net/svn/ppa/ubuntu precise main 
-deb-src http://ppa.launchpad.net/svn/ppa/ubuntu precise main
-
-# Provides PHP 5.4
-deb http://ppa.launchpad.net/ondrej/php5-oldstable/ubuntu precise main
-deb-src http://ppa.launchpad.net/ondrej/php5-oldstable/ubuntu precise main
-
-# Provides Git 1.8
-deb http://ppa.launchpad.net/git-core/ppa/ubuntu precise main 
-deb-src http://ppa.launchpad.net/git-core/ppa/ubuntu precise main
+# Provides PageSpeed, but once installed PageSpeed adds its PPA to /etc/apt/sources.list.d
+#deb http://dl.google.com/linux/mod-pagespeed/deb/ stable main
 
 # Provides Node.js
-deb http://ppa.launchpad.net/chris-lea/node.js/ubuntu precise main
-deb-src http://ppa.launchpad.net/chris-lea/node.js/ubuntu precise main
+deb http://ppa.launchpad.net/chris-lea/node.js/ubuntu trusty main
+deb-src http://ppa.launchpad.net/chris-lea/node.js/ubuntu trusty main
diff --git a/config/bash_profile b/config/bash_profile
@@ -13,6 +13,14 @@ if [ -n "$BASH_VERSION" ]; then
     fi
 fi
 
+# setup bash prompt
+if [ -n "$BASH_VERSION" ]; then
+    # include .bash_prompt if it exists
+    if [ -f "$HOME/.bash_prompt" ]; then
+        . "$HOME/.bash_prompt"
+    fi
+fi
+
 # set PATH so it includes user's private bin if it exists
 if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
@@ -24,3 +32,9 @@ export WP_TESTS_DIR=/srv/www/wordpress-develop/tests/phpunit/
 
 # add autocomplete for grunt
 eval "$(grunt --completion=bash)"
+
+# add autocomplete for wp-cli
+. /srv/www/wp-cli/utils/wp-completion.bash
+
+# PHPCS path
+export PATH="$PATH:/srv/www/phpcs/scripts/"