From 0cce795016b0ae2ad1e6bf08a9f9c7565f1b35f7 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Mon, 16 Dec 2013 10:10:48 -0800 Subject: [PATCH 01/32] Remove tcp_nodelay directive The reasoning here - https://github.com/h5bp/server-configs-nginx/issues/28 - seems to make sense. When we set `tcp_nodelay` to off, we tell Nginx to use Nagle's algorithm to figure out how packets should be buffered with a possible 500ms latency if it can't figure things out in time. This 500ms latency is something that even Nagle says (http://developers.slashdot.org/comments.pl?sid=174457&threshold=1&commentsort=0&mode=thread&cid=14515105) should stay in the 1980s. Suggesting we remove this directive and leave it to Nginx's default `on` to *not* use Nagle's algorithm. --- config/nginx-config/nginx.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/nginx-config/nginx.conf b/config/nginx-config/nginx.conf index 1e105b0..271c9cf 100644 --- a/config/nginx-config/nginx.conf +++ b/config/nginx-config/nginx.conf @@ -48,9 +48,6 @@ http { # Don't send out partial TCP frames tcp_nopush on; - # Merge smaller TCP packets into one larger packet - tcp_nodelay off; - # How long each connection should stay idle keepalive_timeout 5; From 565a3883bf07b97f02171d12bc6511a610f7f7fd Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Wed, 18 Dec 2013 22:14:49 -0800 Subject: [PATCH 02/32] Process subdomains for each default domain we provide Nginx configs for. This makes it easier to setup multisite with subdomains while avoiding too many file edits in the VVV base. Other modifications will still be required, such as setting up recognition for the new hosts on the local machine and in the guest, but this takes away the need to restart Nginx. --- config/nginx-config/sites/default.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/nginx-config/sites/default.conf b/config/nginx-config/sites/default.conf index dcbb95d..3fa4484 100644 --- a/config/nginx-config/sites/default.conf +++ b/config/nginx-config/sites/default.conf @@ -75,7 +75,7 @@ server { server { listen 80; listen 443 ssl; - server_name local.wordpress.dev; + server_name local.wordpress.dev *.local.wordpress.dev; root /srv/www/wordpress-default; include /etc/nginx/nginx-wp-common.conf; } @@ -90,7 +90,7 @@ server { server { listen 80; listen 443 ssl; - server_name local.wordpress-trunk.dev; + server_name local.wordpress-trunk.dev *.local.wordpress-trunk.dev; root /srv/www/wordpress-trunk; include /etc/nginx/nginx-wp-common.conf; } @@ -105,7 +105,7 @@ server { server { listen 80; listen 443 ssl; - server_name src.wordpress-develop.dev; + server_name src.wordpress-develop.dev *.src.wordpress-develop.dev; root /srv/www/wordpress-develop/src; include /etc/nginx/nginx-wp-common.conf; } @@ -120,7 +120,7 @@ server { server { listen 80; listen 443 ssl; - server_name build.wordpress-develop.dev; + server_name build.wordpress-develop.dev *.build.wordpress-develop.dev; root /srv/www/wordpress-develop/build; include /etc/nginx/nginx-wp-common.conf; } From 6bd6419a669f5838f8eeb427cedf3e2e427dd7f1 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Wed, 18 Dec 2013 22:33:07 -0800 Subject: [PATCH 03/32] Check symlinked VVV site setup directories for vvv-hosts files This allows directories in `www/` to be symlinked and still be picked up during `vagrant up` for use with vagrant-hostsupdater. --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index cdafa69..2a79bf7 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -47,7 +47,7 @@ Vagrant.configure("2") do |config| # Capture the paths to all vvv-hosts files under the www/ directory. paths = [] - Dir.glob(vagrant_dir + '/www/**/vvv-hosts').each do |path| + Dir.glob(vagrant_dir + '/www/{,/*/**}/vvv-hosts').each do |path| paths << path end From 995028b883e364ec3851e2af4c009f5b28a20b82 Mon Sep 17 00:00:00 2001 From: Sunny Ratilal Date: Sun, 22 Dec 2013 11:18:13 +0000 Subject: [PATCH 04/32] Fix typo --- www/default/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/default/index.php b/www/default/index.php index 980d35d..c9471ab 100644 --- a/www/default/index.php +++ b/www/default/index.php @@ -31,7 +31,7 @@
  • http://local.wordpress.dev for WordPress stable
  • http://local.wordpress-trunk.dev for WordPress trunk
  • http://src.wordpress-develop.dev for trunk WordPress development files
    • -
  • http://build.wordpress-develop.dev for a Grunt built of those development files
    • +
  • http://build.wordpress-develop.dev for a Grunt build of those development files
    • - \ No newline at end of file + From 94fa99b7d284162fab3dca864626a2771f5b6438 Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Sun, 22 Dec 2013 10:50:26 -0800 Subject: [PATCH 05/32] Update contributors list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f07540a..a0e51ff 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Varying Vagrant Vagrants is an evolving [Vagrant](http://vagrantup.com) configur * **Version**: 1.1-working * **Latest Stable**: [v1.0](https://github.com/10up/varying-vagrant-vagrants/tree/v1.0) -* **Contributors**: [@jeremyfelt](http://github.com/jeremyfelt), [@carldanley](http://github.com/carldanley), [@ericmann](http://github.com/ericmann), [@lkwdwrd](http://github.com/lkwdwrd), [@TheLastCicada](http://github.com/TheLastCicada), [@tddewey](http://github.com/tddewey), [@johnpbloch](http://github.com/johnpbloch), [@kadamwhite](http://github.com/kadamwhite), [@scribu](http://github.com/scribu), [@danielbachhuber](http://github.com/danielbachhuber), [@tollmanz](http://github.com/tollmanz), [@mbijon](http://github.com/mbijon), [@markjaquith](http://github.com/markjaquith), [@curtismchale](http://github.com/curtismchale), [@Mamaduka](http://github.com/mamaduka), [@lgedeon](http://github.com/lgedeon), [@pmgarman](http://github.com/pmgarman), [@westonruter](http://github.com/westonruter), [@petemall](http://github.com/petemall), [@cmmarslender](http://github.com/cmmarslender), [@mintindeed](http://github.com/mintindeed), [@mboynes](http://github.com/mboynes), [@aaronjorbin](http://github.com/aaronjorbin), [@tobiasbg](http://github.com/tobiasbg), [@simonwheatley](http://github.com/simonwheatley), [@ocean90](http://github.com/ocean90), [@lvnilesh](http://github.com/lvnilesh), [@alexw23](http://github.com/alexw23), [@zamoose](https://github.com/zamoose), [@leewillis77](https://github.com/leewillis77), [@imichaeli](https://github.com/imichaeli), [@andrezrv](https://github.com/andrezrv), [@cadwell](https://github.com/cadwell), [@cfoellmann](https://github.com/cfoellmann), [@westi](https://github.com/westi), [@ryanduff](https://github.com/ryanduff), [@selinerdominik](https://github.com/selinerdominik), [@ericandrewlewis](https://github.com/ericandrewlewis), [@vDevices](https://github.com/vDevices) +* **Contributors**: [@jeremyfelt](http://github.com/jeremyfelt), [@carldanley](http://github.com/carldanley), [@ericmann](http://github.com/ericmann), [@lkwdwrd](http://github.com/lkwdwrd), [@TheLastCicada](http://github.com/TheLastCicada), [@tddewey](http://github.com/tddewey), [@johnpbloch](http://github.com/johnpbloch), [@kadamwhite](http://github.com/kadamwhite), [@scribu](http://github.com/scribu), [@danielbachhuber](http://github.com/danielbachhuber), [@tollmanz](http://github.com/tollmanz), [@mbijon](http://github.com/mbijon), [@markjaquith](http://github.com/markjaquith), [@curtismchale](http://github.com/curtismchale), [@Mamaduka](http://github.com/mamaduka), [@lgedeon](http://github.com/lgedeon), [@pmgarman](http://github.com/pmgarman), [@westonruter](http://github.com/westonruter), [@petemall](http://github.com/petemall), [@cmmarslender](http://github.com/cmmarslender), [@mintindeed](http://github.com/mintindeed), [@mboynes](http://github.com/mboynes), [@aaronjorbin](http://github.com/aaronjorbin), [@tobiasbg](http://github.com/tobiasbg), [@simonwheatley](http://github.com/simonwheatley), [@ocean90](http://github.com/ocean90), [@lvnilesh](http://github.com/lvnilesh), [@alexw23](http://github.com/alexw23), [@zamoose](https://github.com/zamoose), [@leewillis77](https://github.com/leewillis77), [@imichaeli](https://github.com/imichaeli), [@andrezrv](https://github.com/andrezrv), [@cadwell](https://github.com/cadwell), [@cfoellmann](https://github.com/cfoellmann), [@westi](https://github.com/westi), [@ryanduff](https://github.com/ryanduff), [@selinerdominik](https://github.com/selinerdominik), [@ericandrewlewis](https://github.com/ericandrewlewis), [@vDevices](https://github.com/vDevices), [@sunnyratilal](https://github.com/sunnyratilal) * **Contributing**: Contributions are more than welcome. Please submit pull requests against the [master branch](https://github.com/10up/varying-vagrant-vagrants). Thanks! ## Overview From 509708e504f8bef74218a5d594e615006ae37fcd Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Mon, 23 Dec 2013 13:40:02 -0800 Subject: [PATCH 06/32] Fix a small number of tabs -> spaces Not entirely sure how we got stuck with spaces rather than tabs, or if that's even a bad thing. There were a few lines that had tabs that needed to be fixed. --- config/nginx-config/nginx-wp-common.conf | 10 +++++----- config/nginx-config/nginx.conf | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/nginx-config/nginx-wp-common.conf b/config/nginx-config/nginx-wp-common.conf index 6caedcf..6893624 100644 --- a/config/nginx-config/nginx-wp-common.conf +++ b/config/nginx-config/nginx-wp-common.conf @@ -25,9 +25,9 @@ rewrite /wp-admin$ $scheme://$host$uri/ permanent; # this prevents hidden files (beginning with a period) from being served location ~ /\. { - access_log off; - log_not_found off; - deny all; + access_log off; + log_not_found off; + deny all; } # Pass uploaded files to wp-includes/ms-files.php. @@ -54,12 +54,12 @@ location ~ \.php$ { # The amount of time for upstream to wait for a fastcgi process to send data. # We keep this *extremely* high so that one can be lazy when remote debugging. - fastcgi_read_timeout 3600s; + fastcgi_read_timeout 3600s; # Buffer size for reading the header of the backend FastCGI process. # This defaults to the value of a single fastcgi_buffers, so does not # need to be specified in our case, but it's good to be explicit. - fastcgi_buffer_size 128k; + fastcgi_buffer_size 128k; # The number and size of the buffers into which the reply from the FastCGI # process in the backend is read. diff --git a/config/nginx-config/nginx.conf b/config/nginx-config/nginx.conf index 271c9cf..f2f47d3 100644 --- a/config/nginx-config/nginx.conf +++ b/config/nginx-config/nginx.conf @@ -87,7 +87,7 @@ http { # Upstream to abstract backend connection(s) for PHP. upstream php { - server unix:/var/run/php5-fpm.sock; + server unix:/var/run/php5-fpm.sock; } # If the requested body size is more than the buffer size, the entire body is From 8f685bcdfef0438890f0b042ca79747c3bd2e44e Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Mon, 23 Dec 2013 13:44:50 -0800 Subject: [PATCH 07/32] s/Accomodate/Accommodate --- config/nginx-config/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/nginx-config/nginx.conf b/config/nginx-config/nginx.conf index f2f47d3..da7de15 100644 --- a/config/nginx-config/nginx.conf +++ b/config/nginx-config/nginx.conf @@ -105,7 +105,7 @@ http { # The maximum number and size of large headers to accept from a client large_client_header_buffers 4 16k; - # Accomodate server directives that have hundred(s) of server_names, such as large multisite networks + # Accommodate server directives that have hundred(s) of server_names, such as large multisite networks server_names_hash_max_size 512; server_names_hash_bucket_size 512; From 5f9c44bfd868c453c79d9b2a8bcb34bc5245cf8d Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Mon, 23 Dec 2013 13:45:10 -0800 Subject: [PATCH 08/32] s/escpecially/especially --- config/mysql-config/my.cnf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mysql-config/my.cnf b/config/mysql-config/my.cnf index 6023060..d6837dd 100644 --- a/config/mysql-config/my.cnf +++ b/config/mysql-config/my.cnf @@ -14,7 +14,7 @@ # This will be passed to all mysql clients # It has been reported that passwords should be enclosed with ticks/quotes -# escpecially if they contain "#" chars... +# especially if they contain "#" chars... # Remember to edit /etc/mysql/debian.cnf when changing the socket location. [client] port = 3306 From 974daf69a774758811ce395afa906e9534409e48 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Mon, 23 Dec 2013 13:45:48 -0800 Subject: [PATCH 09/32] s/completition/completion --- config/mysql-config/my.cnf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/mysql-config/my.cnf b/config/mysql-config/my.cnf index d6837dd..57f4dbf 100644 --- a/config/mysql-config/my.cnf +++ b/config/mysql-config/my.cnf @@ -73,7 +73,7 @@ quote-names max_allowed_packet = 128M [mysql] -#no-auto-rehash # faster start of mysql but no tab completition +#no-auto-rehash # faster start of mysql but no tab completion [isamchk] From 0a795340204056e14246960f1eca6bb376e5bee7 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Mon, 23 Dec 2013 13:52:45 -0800 Subject: [PATCH 10/32] Trim php.ini down to contain the most important info. This should make it easier to find settings that need to be changed rather than having to skim through a bunch of stuff looking for something relevant --- config/php5-fpm-config/php-custom.ini | 91 +++------------------------ 1 file changed, 10 insertions(+), 81 deletions(-) diff --git a/config/php5-fpm-config/php-custom.ini b/config/php5-fpm-config/php-custom.ini index 8d69ebb..c3126a8 100644 --- a/config/php5-fpm-config/php-custom.ini +++ b/config/php5-fpm-config/php-custom.ini @@ -1,121 +1,50 @@ [PHP] ; Recommended that short tags - - are not used. -; Default Value: On -; Development Value: Off -; Production Value: Off -; http://php.net/short-open-tag short_open_tag = Off -; If you pass a value by reference at function call time... -; Default Value: On (Suppress warnings) -; Development Value: Off (Issue warnings) -; Production Value: Off (Issue warnings) -; http://php.net/allow-call-time-pass-reference +; Issue warning if you pass a value by reference at function call time. allow_call_time_pass_reference = Off -; Maximum execution time of each script, in seconds -; http://php.net/max-execution-time -; Note: This directive is hardcoded to 0 for the CLI SAPI +; Maximum execution time of each script, in seconds. (Hard coded at 0 for CLI) max_execution_time = 30 -; Maximum amount of memory a script may consume (128MB) -; http://php.net/memory-limit +; Maximum amount of memory a script may consume. memory_limit = 128M -; Common Values: -; E_ALL & ~E_NOTICE (Show all errors, except for notices and coding standards warnings.) -; E_ALL & ~E_NOTICE | E_STRICT (Show all errors, except for notices) -; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors) -; E_ALL | E_STRICT (Show all errors, warnings and notices including coding standards.) -; Default Value: E_ALL & ~E_NOTICE -; Development Value: E_ALL | E_STRICT -; Production Value: E_ALL & ~E_DEPRECATED -; http://php.net/error-reporting +; Show all errors except for notices. error_reporting = E_ALL | E_STRICT -; Should PHP output errors. If so, where? -; Possible Values: -; Off = Do not display any errors -; stderr = Display errors to STDERR (affects only CGI/CLI binaries!) -; On or stdout = Display errors to STDOUT -; Default Value: On -; Development Value: On -; Production Value: Off -; http://php.net/display-errors +; Display errors to STDOUT display_errors = On -; Besides displaying errors, PHP can also log errors to locations such as a -; server-specific log, STDERR, or a location specified by the error_log -; directive found below. While errors should not be displayed on productions -; servers they should still be monitored and logging is a great way to do that. -; Default Value: Off -; Development Value: On -; Production Value: On -; http://php.net/log-errors +; Log errors in addition to displaying them. log_errors = On -; Set maximum length of log_errors. In error_log information about the source is -; added. The default is 1024 and 0 allows to not apply any maximum length at all. -; http://php.net/log-errors-max-len +; Set maximum length of log_errors. log_errors_max_len = 1024 -; Do not log repeated messages. Repeated errors must occur in same file on same -; line unless ignore_repeated_source is set true. -; http://php.net/ignore-repeated-errors +; Log repeated messages. ignore_repeated_errors = Off - -; Ignore source of message when ignoring repeated messages. When this setting -; is On you will not log errors with repeated messages from different files or -; source lines. -; http://php.net/ignore-repeated-source ignore_repeated_source = Off -; Store the last error/warning message in $php_errormsg (boolean). Setting this value -; to On can assist in debugging and is appropriate for development servers. It should -; however be disabled on production servers. -; Default Value: Off -; Development Value: On -; Production Value: Off -; http://php.net/track-errors +; Store the last error/warning message in $php_errormsg (boolean). track_errors = Off ; Display HTML links to docs related to the error? -; Default Value: On -; Development Value: On -; Production value: Off -; http://php.net/html-errors html_errors = 1 -; String to output before an error message. PHP's default behavior is to leave -; this setting blank. -; http://php.net/error-prepend-string -; Example: -;error_prepend_string = "" - -; String to output after an error message. PHP's default behavior is to leave -; this setting blank. -; http://php.net/error-append-string -; Example: -;error_append_string = "" - -; Log errors to specified file. PHP's default behavior is to leave this value -; empty. -; http://php.net/error-log -; Example: +; Log errors to specified file. error_log = /tmp/php_errors.log ; Maximum size of POST data that PHP will accept. -; http://php.net/post-max-size post_max_size = 50M ; Maximum allowed size for uploaded files. -; http://php.net/upload-max-filesize upload_max_filesize = 50M ; Maximum number of files that can be uploaded via a single request max_file_uploads = 20 ; Default timeout for socket based streams (seconds) -; http://php.net/default-socket-timeout default_socket_timeout = 60 From b565dd46944cdf6b8e6ed11bb34422203ab26bef Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Mon, 23 Dec 2013 13:59:43 -0800 Subject: [PATCH 11/32] Add a documentation notice to the top of php.ini --- config/php5-fpm-config/php-custom.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/php5-fpm-config/php-custom.ini b/config/php5-fpm-config/php-custom.ini index c3126a8..fa6942c 100644 --- a/config/php5-fpm-config/php-custom.ini +++ b/config/php5-fpm-config/php-custom.ini @@ -1,3 +1,6 @@ +; Much of the default text has been stripped from this config file in order to +; improve readability. If you'd like to explore various configurations of PHP +; by using this file, see http://www.php.net/manual/en/ini.core.php [PHP] ; Recommended that short tags - - are not used. From 0f0fcb85284291c3c77cf54d1c8baa96715e7f58 Mon Sep 17 00:00:00 2001 From: Christian Foellmann Date: Thu, 26 Dec 2013 14:11:00 +0100 Subject: [PATCH 12/32] update phpmyadmin to 4.1.2 --- provision/provision.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provision/provision.sh b/provision/provision.sh index a4b195a..e6f9477 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -515,9 +515,9 @@ PHP if [[ ! -d /srv/www/default/database-admin ]]; then echo "Downloading phpMyAdmin 4.0.10..." cd /srv/www/default - wget -q -O phpmyadmin.tar.gz 'http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/4.0.10/phpMyAdmin-4.0.10-all-languages.tar.gz/download' + wget -q -O phpmyadmin.tar.gz 'http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/4.1.2/phpMyAdmin-4.1.2-all-languages.tar.gz/download' tar -xf phpmyadmin.tar.gz - mv phpMyAdmin-4.0.10-all-languages database-admin + mv phpMyAdmin-4.1.2-all-languages database-admin rm phpmyadmin.tar.gz else echo "PHPMyAdmin already installed." From c65219179d0df488a6e2f91507e3ea7d61a93bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Villarreal?= Date: Fri, 3 Jan 2014 15:44:09 -0300 Subject: [PATCH 13/32] Fixed typo in Grunt installation. --- provision/provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision/provision.sh b/provision/provision.sh index e6f9477..c0e1a40 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -239,7 +239,7 @@ if [[ $ping_result == *bytes?from* ]]; then # Grunt # - # Install or Update Grunt based on gurrent state. Updates are direct + # Install or Update Grunt based on current state. Updates are direct # from NPM if [[ "$(grunt --version)" ]]; then echo "Updating Grunt CLI" From bfc8f4477d92497d66cd75cd03e0681a71a0ece0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Villarreal?= Date: Mon, 6 Jan 2014 13:26:19 -0300 Subject: [PATCH 14/32] Added zip to apt_package_check_list. --- provision/provision.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/provision/provision.sh b/provision/provision.sh index c0e1a40..93dc6f6 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -72,6 +72,7 @@ apt_package_check_list=( imagemagick subversion git-core + zip unzip ngrep curl From c66c787dc305d9f05004d6fc75dd8893656949ab Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Mon, 6 Jan 2014 22:52:48 -0800 Subject: [PATCH 15/32] Revert "Check symlinked VVV site setup directories for vvv-hosts files" This reverts commit 6bd6419a669f5838f8eeb427cedf3e2e427dd7f1. Symlinks may work inside the Vagrantfile, but the VM is not able to access them internally, so they do us no good. --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 2a79bf7..cdafa69 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -47,7 +47,7 @@ Vagrant.configure("2") do |config| # Capture the paths to all vvv-hosts files under the www/ directory. paths = [] - Dir.glob(vagrant_dir + '/www/{,/*/**}/vvv-hosts').each do |path| + Dir.glob(vagrant_dir + '/www/**/vvv-hosts').each do |path| paths << path end From eebfad9de627895d7e202f1c60c816ef12de1d37 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Tue, 7 Jan 2014 22:28:11 -0800 Subject: [PATCH 16/32] Add global requirements for composer Uses @johnpbloch's suggested method for setting this up as a first go. https://gist.github.com/johnpbloch/6264213 --- provision/provision.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/provision/provision.sh b/provision/provision.sh index 93dc6f6..0a76791 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -194,12 +194,18 @@ if [[ $ping_result == *bytes?from* ]]; then # master branch on GitHub repository. if [[ -n "$(composer --version | grep -q 'Composer version')" ]]; then echo "Updating Composer..." - composer self-update + COMPOSER_HOME=/usr/local/src/composer composer self-update + COMPOSER_HOME=/usr/local/src/composer composer global update else echo "Installing Composer..." curl -sS https://getcomposer.org/installer | php chmod +x composer.phar mv composer.phar /usr/local/bin/composer + + COMPOSER_HOME=/usr/local/src/composer composer global require --no-update phpunit/phpunit:3.7.* + COMPOSER_HOME=/usr/local/src/composer composer global require --no-update mockery/mockery:1.8.* + COMPOSER_HOME=/usr/local/src/composer composer global require --no-update d11wtq/boris:v1.0.2 + COMPOSER_HOME=/usr/local/src/composer composer global update fi # PHPUnit From 71ad18d41b6b31ff948278e988e174d43c783a30 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Tue, 7 Jan 2014 22:34:16 -0800 Subject: [PATCH 17/32] Mockery is at 0.8.0, not 1.8.0 --- provision/provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision/provision.sh b/provision/provision.sh index 0a76791..a6073a8 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -203,7 +203,7 @@ if [[ $ping_result == *bytes?from* ]]; then mv composer.phar /usr/local/bin/composer COMPOSER_HOME=/usr/local/src/composer composer global require --no-update phpunit/phpunit:3.7.* - COMPOSER_HOME=/usr/local/src/composer composer global require --no-update mockery/mockery:1.8.* + COMPOSER_HOME=/usr/local/src/composer composer global require --no-update mockery/mockery:0.8.* COMPOSER_HOME=/usr/local/src/composer composer global require --no-update d11wtq/boris:v1.0.2 COMPOSER_HOME=/usr/local/src/composer composer global update fi From cab0bf24d1f6e44a620a4847a2186e9d91247157 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Tue, 7 Jan 2014 22:48:24 -0800 Subject: [PATCH 18/32] Remove previous composer config for phpunit and mockery Now that things are global, this should work? --- config/phpunit-composer.json | 2 -- provision/provision.sh | 12 +----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/config/phpunit-composer.json b/config/phpunit-composer.json index 616cc30..5dc6de1 100644 --- a/config/phpunit-composer.json +++ b/config/phpunit-composer.json @@ -2,8 +2,6 @@ "name": "vvv-phpunit", "description": "VVV Global Composer packages", "require": { - "phpunit/phpunit": "3.7.*", - "mockery/mockery": "0.8.0", "hamcrest/hamcrest": "1.1.0" }, "config": { diff --git a/provision/provision.sh b/provision/provision.sh index a6073a8..4f832b4 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -220,16 +220,6 @@ if [[ $ping_result == *bytes?from* ]]; then sh -c "cd /usr/local/src/vvv-phpunit && composer install" else cd /usr/local/src/vvv-phpunit - if [[ -n "$(composer show -i | grep -q 'mockery')" ]]; then - echo "Mockery installed" - else - vvvphpunit_update=1 - fi - if [[ -n "$(composer show -i | grep -q 'phpunit')" ]]; then - echo "PHPUnit installed" - else - vvvphpunit_update=1 - fi if [[ -n "$(composer show -i | grep -q 'hamcrest')" ]]; then echo "Hamcrest installed" else @@ -239,7 +229,7 @@ if [[ $ping_result == *bytes?from* ]]; then fi if [[ "$vvvphpunit_update" = 1 ]]; then - echo "Update PHPUnit, Hamcrest and Mockery..." + echo "Update Hamcrest..." cp /srv/config/phpunit-composer.json /usr/local/src/vvv-phpunit/composer.json sh -c "cd /usr/local/src/vvv-phpunit && composer update" fi From 93484d7cc9242400cd08058a3c97e711d5fc3e3b Mon Sep 17 00:00:00 2001 From: "John P. Bloch" Date: Wed, 8 Jan 2014 08:28:16 -0500 Subject: [PATCH 19/32] Set the bin-dir config value after adding requirements --- provision/provision.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/provision/provision.sh b/provision/provision.sh index 4f832b4..a0e3eab 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -205,6 +205,7 @@ if [[ $ping_result == *bytes?from* ]]; then COMPOSER_HOME=/usr/local/src/composer composer global require --no-update phpunit/phpunit:3.7.* COMPOSER_HOME=/usr/local/src/composer composer global require --no-update mockery/mockery:0.8.* COMPOSER_HOME=/usr/local/src/composer composer global require --no-update d11wtq/boris:v1.0.2 + COMPOSER_HOME=/usr/local/src/composer composer global config bin-dir /usr/local/bin COMPOSER_HOME=/usr/local/src/composer composer global update fi From 6a95b6f8f980a9dab4cac14f0650354dd812af10 Mon Sep 17 00:00:00 2001 From: "John P. Bloch" Date: Wed, 8 Jan 2014 09:05:54 -0500 Subject: [PATCH 20/32] Silence the composer commands that just set things up --- provision/provision.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/provision/provision.sh b/provision/provision.sh index a0e3eab..29dc438 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -202,10 +202,10 @@ if [[ $ping_result == *bytes?from* ]]; then chmod +x composer.phar mv composer.phar /usr/local/bin/composer - COMPOSER_HOME=/usr/local/src/composer composer global require --no-update phpunit/phpunit:3.7.* - COMPOSER_HOME=/usr/local/src/composer composer global require --no-update mockery/mockery:0.8.* - COMPOSER_HOME=/usr/local/src/composer composer global require --no-update d11wtq/boris:v1.0.2 - COMPOSER_HOME=/usr/local/src/composer composer global config bin-dir /usr/local/bin + COMPOSER_HOME=/usr/local/src/composer composer -q global require --no-update phpunit/phpunit:3.7.* + COMPOSER_HOME=/usr/local/src/composer composer -q global require --no-update mockery/mockery:0.8.* + COMPOSER_HOME=/usr/local/src/composer composer -q global require --no-update d11wtq/boris:v1.0.2 + COMPOSER_HOME=/usr/local/src/composer composer -q global config bin-dir /usr/local/bin COMPOSER_HOME=/usr/local/src/composer composer global update fi From 43fe16ce8138463d1a5ff5bb31cd37b801656218 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Wed, 8 Jan 2014 20:12:28 -0800 Subject: [PATCH 21/32] Remove custom composer.json setup in favor of new global config Also removes Hamcrest, as it is not needed or useful on its own. See #129 for full discussion --- config/phpunit-composer.json | 28 ---------------------------- provision/provision.sh | 26 -------------------------- 2 files changed, 54 deletions(-) delete mode 100644 config/phpunit-composer.json diff --git a/config/phpunit-composer.json b/config/phpunit-composer.json deleted file mode 100644 index 5dc6de1..0000000 --- a/config/phpunit-composer.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "vvv-phpunit", - "description": "VVV Global Composer packages", - "require": { - "hamcrest/hamcrest": "1.1.0" - }, - "config": { - "bin-dir": "/usr/local/bin/" - }, - "repositories": [ - { - "type": "package", - "package": { - "name": "hamcrest/hamcrest", - "version": "1.1.0", - "dist": { - "type": "zip", - "url": "https://hamcrest.googlecode.com/files/hamcrest-php-1.1.0.zip" - }, - "include-path": ["Hamcrest-1.1.0/"], - "autoload": { - "psr-0": { "Hamcrest_": "Hamcrest-1.1.0/" }, - "files": ["Hamcrest-1.1.0/Hamcrest/Hamcrest.php"] - } - } - } - ] -} diff --git a/provision/provision.sh b/provision/provision.sh index 29dc438..e53ecde 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -209,32 +209,6 @@ if [[ $ping_result == *bytes?from* ]]; then COMPOSER_HOME=/usr/local/src/composer composer global update fi - # PHPUnit - # - # Check that PHPUnit, Mockery, and Hamcrest are all successfully installed. - # If not, then Composer should be given another shot at it. Versions for - # these packages are controlled in `/srv/config/phpunit-composer.json`. - if [[ ! -d /usr/local/src/vvv-phpunit ]]; then - echo "Installing PHPUnit, Hamcrest and Mockery..." - mkdir -p /usr/local/src/vvv-phpunit - cp /srv/config/phpunit-composer.json /usr/local/src/vvv-phpunit/composer.json - sh -c "cd /usr/local/src/vvv-phpunit && composer install" - else - cd /usr/local/src/vvv-phpunit - if [[ -n "$(composer show -i | grep -q 'hamcrest')" ]]; then - echo "Hamcrest installed" - else - vvvphpunit_update=1 - fi - cd ~/ - fi - - if [[ "$vvvphpunit_update" = 1 ]]; then - echo "Update Hamcrest..." - cp /srv/config/phpunit-composer.json /usr/local/src/vvv-phpunit/composer.json - sh -c "cd /usr/local/src/vvv-phpunit && composer update" - fi - # Grunt # # Install or Update Grunt based on current state. Updates are direct From 177f6a28fc25a9291bcd557199112f0a1efdb4e4 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Wed, 8 Jan 2014 20:53:41 -0800 Subject: [PATCH 22/32] Add suggested phpunit/php-invoker to our global composer config It's unclear if this will ever actually be a requirement for us, but it's not a horrible thing to have. See https://packagist.org/packages/phpunit/php-invoker for full details. Invokes callables with a timeouts. --- provision/provision.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/provision/provision.sh b/provision/provision.sh index e53ecde..6b3e11d 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -203,6 +203,7 @@ if [[ $ping_result == *bytes?from* ]]; then mv composer.phar /usr/local/bin/composer COMPOSER_HOME=/usr/local/src/composer composer -q global require --no-update phpunit/phpunit:3.7.* + COMPOSER_HOME=/usr/local/src/composer composer -q global require --no-update phpunit/php-invoker:1.1.* COMPOSER_HOME=/usr/local/src/composer composer -q global require --no-update mockery/mockery:0.8.* COMPOSER_HOME=/usr/local/src/composer composer -q global require --no-update d11wtq/boris:v1.0.2 COMPOSER_HOME=/usr/local/src/composer composer -q global config bin-dir /usr/local/bin From 7fce59f5cc1c15f040433eb9598ee2ebfe9135e6 Mon Sep 17 00:00:00 2001 From: Enej Bajgoric Date: Sun, 12 Jan 2014 21:18:58 -0800 Subject: [PATCH 23/32] updated phpmyadmin to 4.1.3 --- provision/provision.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/provision/provision.sh b/provision/provision.sh index 6b3e11d..56304f5 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -486,11 +486,11 @@ PHP # Download phpMyAdmin if [[ ! -d /srv/www/default/database-admin ]]; then - echo "Downloading phpMyAdmin 4.0.10..." + echo "Downloading phpMyAdmin 4.1.3..." cd /srv/www/default - wget -q -O phpmyadmin.tar.gz 'http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/4.1.2/phpMyAdmin-4.1.2-all-languages.tar.gz/download' + wget -q -O phpmyadmin.tar.gz 'http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/4.1.3/phpMyAdmin-4.1.3-all-languages.tar.gz/download' tar -xf phpmyadmin.tar.gz - mv phpMyAdmin-4.1.2-all-languages database-admin + mv phpMyAdmin-4.1.3-all-languages database-admin rm phpmyadmin.tar.gz else echo "PHPMyAdmin already installed." From 93a66487935f13bff679dfb38737be307bc8129c Mon Sep 17 00:00:00 2001 From: Enej Bajgoric Date: Sun, 12 Jan 2014 23:44:19 -0800 Subject: [PATCH 24/32] also update the readme documentation with phpmyadmin 4.1.3 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a0e51ff..f73a35c 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,7 @@ A bunch of stuff! 1. [dos2unix](http://dos2unix.sourceforge.net/) 1. [Composer](https://github.com/composer/composer) 1. [phpMemcachedAdmin](https://code.google.com/p/phpmemcacheadmin/) 1.2.2 BETA -1. [phpMyAdmin](http://www.phpmyadmin.net/) 4.0.10 (multi-language) +1. [phpMyAdmin](http://www.phpmyadmin.net/) 4.1.3 (multi-language) 1. [Webgrind](https://github.com/jokkedk/webgrind) 1. [NodeJs](http://nodejs.org/) Current Stable Version 1. [grunt-cli](https://github.com/gruntjs/grunt-cli) Current Stable Version From 2a12f97becb4a88695b0eaa366f286236559c59e Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Tue, 14 Jan 2014 15:33:06 -0800 Subject: [PATCH 25/32] Update contributors list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f73a35c..a41c8a9 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Varying Vagrant Vagrants is an evolving [Vagrant](http://vagrantup.com) configur * **Version**: 1.1-working * **Latest Stable**: [v1.0](https://github.com/10up/varying-vagrant-vagrants/tree/v1.0) -* **Contributors**: [@jeremyfelt](http://github.com/jeremyfelt), [@carldanley](http://github.com/carldanley), [@ericmann](http://github.com/ericmann), [@lkwdwrd](http://github.com/lkwdwrd), [@TheLastCicada](http://github.com/TheLastCicada), [@tddewey](http://github.com/tddewey), [@johnpbloch](http://github.com/johnpbloch), [@kadamwhite](http://github.com/kadamwhite), [@scribu](http://github.com/scribu), [@danielbachhuber](http://github.com/danielbachhuber), [@tollmanz](http://github.com/tollmanz), [@mbijon](http://github.com/mbijon), [@markjaquith](http://github.com/markjaquith), [@curtismchale](http://github.com/curtismchale), [@Mamaduka](http://github.com/mamaduka), [@lgedeon](http://github.com/lgedeon), [@pmgarman](http://github.com/pmgarman), [@westonruter](http://github.com/westonruter), [@petemall](http://github.com/petemall), [@cmmarslender](http://github.com/cmmarslender), [@mintindeed](http://github.com/mintindeed), [@mboynes](http://github.com/mboynes), [@aaronjorbin](http://github.com/aaronjorbin), [@tobiasbg](http://github.com/tobiasbg), [@simonwheatley](http://github.com/simonwheatley), [@ocean90](http://github.com/ocean90), [@lvnilesh](http://github.com/lvnilesh), [@alexw23](http://github.com/alexw23), [@zamoose](https://github.com/zamoose), [@leewillis77](https://github.com/leewillis77), [@imichaeli](https://github.com/imichaeli), [@andrezrv](https://github.com/andrezrv), [@cadwell](https://github.com/cadwell), [@cfoellmann](https://github.com/cfoellmann), [@westi](https://github.com/westi), [@ryanduff](https://github.com/ryanduff), [@selinerdominik](https://github.com/selinerdominik), [@ericandrewlewis](https://github.com/ericandrewlewis), [@vDevices](https://github.com/vDevices), [@sunnyratilal](https://github.com/sunnyratilal) +* **Contributors**: [@jeremyfelt](http://github.com/jeremyfelt), [@carldanley](http://github.com/carldanley), [@ericmann](http://github.com/ericmann), [@lkwdwrd](http://github.com/lkwdwrd), [@TheLastCicada](http://github.com/TheLastCicada), [@tddewey](http://github.com/tddewey), [@johnpbloch](http://github.com/johnpbloch), [@kadamwhite](http://github.com/kadamwhite), [@scribu](http://github.com/scribu), [@danielbachhuber](http://github.com/danielbachhuber), [@tollmanz](http://github.com/tollmanz), [@mbijon](http://github.com/mbijon), [@markjaquith](http://github.com/markjaquith), [@curtismchale](http://github.com/curtismchale), [@Mamaduka](http://github.com/mamaduka), [@lgedeon](http://github.com/lgedeon), [@pmgarman](http://github.com/pmgarman), [@westonruter](http://github.com/westonruter), [@petemall](http://github.com/petemall), [@cmmarslender](http://github.com/cmmarslender), [@mintindeed](http://github.com/mintindeed), [@mboynes](http://github.com/mboynes), [@aaronjorbin](http://github.com/aaronjorbin), [@tobiasbg](http://github.com/tobiasbg), [@simonwheatley](http://github.com/simonwheatley), [@ocean90](http://github.com/ocean90), [@lvnilesh](http://github.com/lvnilesh), [@alexw23](http://github.com/alexw23), [@zamoose](https://github.com/zamoose), [@leewillis77](https://github.com/leewillis77), [@imichaeli](https://github.com/imichaeli), [@andrezrv](https://github.com/andrezrv), [@cadwell](https://github.com/cadwell), [@cfoellmann](https://github.com/cfoellmann), [@westi](https://github.com/westi), [@ryanduff](https://github.com/ryanduff), [@selinerdominik](https://github.com/selinerdominik), [@ericandrewlewis](https://github.com/ericandrewlewis), [@vDevices](https://github.com/vDevices), [@sunnyratilal](https://github.com/sunnyratilal), [@enejb](https://github.com/enejb) * **Contributing**: Contributions are more than welcome. Please submit pull requests against the [master branch](https://github.com/10up/varying-vagrant-vagrants). Thanks! ## Overview From 0e01f9ec08646190c6b28fa0593dabee410ae40c Mon Sep 17 00:00:00 2001 From: Zachary Brown Date: Sun, 26 Jan 2014 14:52:58 -0800 Subject: [PATCH 26/32] Adding --allow-root to all wp-cli calls wp-cli now requires --allow-root in order to run as the root user due to security concerns (see https://github.com/wp-cli/wp-cli/issues/982 and https://github.com/wp-cli/wp-cli/pull/973). I've added this flag to all uses of wp-cli in provision.sh. The auto-site setup stuff will need adjustment as well, but I'm less familiar with those and will have to take a closer look to see where that is needed. --- provision/provision.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/provision/provision.sh b/provision/provision.sh index 56304f5..58c27f1 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -426,14 +426,14 @@ if [[ $ping_result == *bytes?from* ]]; then rm latest.tar.gz cd /srv/www/wordpress-default echo "Configuring WordPress Stable..." - wp core config --dbname=wordpress_default --dbuser=wp --dbpass=wp --quiet --extra-php </dev/null From 17bd7e290a2e83b26e772060fb17d29f8511b39b Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Mon, 3 Feb 2014 09:59:36 -0800 Subject: [PATCH 27/32] Update GitHub URLs in README to point to the new repository --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a41c8a9..e0d31ea 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Varying Vagrant Vagrants is an evolving [Vagrant](http://vagrantup.com) configuration focused on [WordPress](http://wordpress.org) development. * **Version**: 1.1-working -* **Latest Stable**: [v1.0](https://github.com/10up/varying-vagrant-vagrants/tree/v1.0) +* **Latest Stable**: [v1.0](https://github.com/varying-vagrant-vagrants/vvv/tree/v1.0) * **Contributors**: [@jeremyfelt](http://github.com/jeremyfelt), [@carldanley](http://github.com/carldanley), [@ericmann](http://github.com/ericmann), [@lkwdwrd](http://github.com/lkwdwrd), [@TheLastCicada](http://github.com/TheLastCicada), [@tddewey](http://github.com/tddewey), [@johnpbloch](http://github.com/johnpbloch), [@kadamwhite](http://github.com/kadamwhite), [@scribu](http://github.com/scribu), [@danielbachhuber](http://github.com/danielbachhuber), [@tollmanz](http://github.com/tollmanz), [@mbijon](http://github.com/mbijon), [@markjaquith](http://github.com/markjaquith), [@curtismchale](http://github.com/curtismchale), [@Mamaduka](http://github.com/mamaduka), [@lgedeon](http://github.com/lgedeon), [@pmgarman](http://github.com/pmgarman), [@westonruter](http://github.com/westonruter), [@petemall](http://github.com/petemall), [@cmmarslender](http://github.com/cmmarslender), [@mintindeed](http://github.com/mintindeed), [@mboynes](http://github.com/mboynes), [@aaronjorbin](http://github.com/aaronjorbin), [@tobiasbg](http://github.com/tobiasbg), [@simonwheatley](http://github.com/simonwheatley), [@ocean90](http://github.com/ocean90), [@lvnilesh](http://github.com/lvnilesh), [@alexw23](http://github.com/alexw23), [@zamoose](https://github.com/zamoose), [@leewillis77](https://github.com/leewillis77), [@imichaeli](https://github.com/imichaeli), [@andrezrv](https://github.com/andrezrv), [@cadwell](https://github.com/cadwell), [@cfoellmann](https://github.com/cfoellmann), [@westi](https://github.com/westi), [@ryanduff](https://github.com/ryanduff), [@selinerdominik](https://github.com/selinerdominik), [@ericandrewlewis](https://github.com/ericandrewlewis), [@vDevices](https://github.com/vDevices), [@sunnyratilal](https://github.com/sunnyratilal), [@enejb](https://github.com/enejb) * **Contributing**: Contributions are more than welcome. Please submit pull requests against the [master branch](https://github.com/10up/varying-vagrant-vagrants). Thanks! @@ -28,11 +28,11 @@ Multiple projects can be developed at once in the same environment. * Use the `wordpress-develop` directory to participate in [WordPress core](http://core.trac.wordpress.org) development. * Use `wp-content/themes` in either the `wordpress-default` or `wordpress-trunk` directories to develop multiple themes. * Use `wp-content/plugins` in either the `wordpress-default` or `wordpress-trunk` directories to develop plugins. -* Take advantage of VVV's [auto site configuration](https://github.com/10up/varying-vagrant-vagrants/wiki/Auto-site-Setup) to provision additional instances of WordPress in `/srv/www/`. +* Take advantage of VVV's [auto site configuration](https://github.com/varying-vagrant-vagrants/vvv/wiki/Auto-site-Setup) to provision additional instances of WordPress in `/srv/www/`. #### VVV as a Scaffold -Entirely different server configurations can be created by modifying the files included with VVV and through the use of additional [Auto Site Setup](https://github.com/10up/varying-vagrant-vagrants/wiki/Auto-site-Setup) provisioning scripts. +Entirely different server configurations can be created by modifying the files included with VVV and through the use of additional [Auto Site Setup](https://github.com/varying-vagrant-vagrants/vvv/wiki/Auto-site-Setup) provisioning scripts. It is not necessary to track the changes made to the main repository. Feel free to check this project out and then change everything to make it your own. @@ -64,8 +64,8 @@ Immediate goals for VVV include: * If you choose not to install this plugin, a manual entry should be added to your local `hosts` file that looks like this: `192.168.50.4 vvv.dev local.wordpress.dev local.wordpress-trunk.dev src.wordpress-develop.dev build.wordpress-develop.dev` 1. Clone or extract the Varying Vagrant Vagrants project into a local directory * `git clone git://github.com/10up/varying-vagrant-vagrants.git vagrant-local` - * OR download and extract the repository master [zip file](https://github.com/10up/varying-vagrant-vagrants/archive/master.zip) - * OR grab a [stable release](https://github.com/10up/varying-vagrant-vagrants/releases) if you'd like some extra comfort. + * OR download and extract the repository master [zip file](https://github.com/varying-vagrant-vagrants/vvv/archive/master.zip) + * OR grab a [stable release](https://github.com/varying-vagrant-vagrants/vvv/releases) if you'd like some extra comfort. 1. Change into the new directory with `cd vagrant-local` 1. Start the Vagrant environment with `vagrant up` * Be patient as the magic happens. This could take a while on the first run as your local machine downloads the required files. @@ -103,7 +103,7 @@ Now that you're up and running, start poking around and modifying things. 1. Suspend the box's state in memory with `vagrant suspend` and bring it right back with `vagrant resume`. 1. Reapply provisioning to a running box with `vagrant provision`. 1. Destroy the box with `vagrant destroy`. Files added in the `www` directory will persist on the next `vagrant up`. -1. Start modifying and adding local files to fit your needs. Take a look at [Auto Site Setup](https://github.com/10up/varying-vagrant-vagrants/wiki/Auto-site-Setup) for tips on adding new projects. +1. Start modifying and adding local files to fit your needs. Take a look at [Auto Site Setup](https://github.com/varying-vagrant-vagrants/vvv/wiki/Auto-site-Setup) for tips on adding new projects. #### Caveats @@ -132,7 +132,7 @@ All WordPress admin usernames and passwords for WordPress installations included #### MySQL Root * User: `root` * Pass: `root` -* See: [Connecting to MySQL](https://github.com/10up/varying-vagrant-vagrants/wiki/Connecting-to-MySQL) from your local machine +* See: [Connecting to MySQL](https://github.com/varying-vagrant-vagrants/vvv/wiki/Connecting-to-MySQL) from your local machine ### What do you get? @@ -168,7 +168,7 @@ A bunch of stuff! * Let us have it! Don't hesitate to open a new issue on GitHub if you run into trouble or have any tips that we need to know. * There is a [Mailing list](https://groups.google.com/forum/#!forum/wordpress-and-vagrant) for any topic related to WordPress and Vagrant that is a great place to get started. -* The [VVV Wiki](https://github.com/10up/varying-vagrant-vagrants/wiki) also contains documentation that may help. +* The [VVV Wiki](https://github.com/varying-vagrant-vagrants/vvv/wiki) also contains documentation that may help. ### More Context From eb3a1c03a23c1c6343f85fbdec048c926304f5e9 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Mon, 3 Feb 2014 10:05:08 -0800 Subject: [PATCH 28/32] Add an origin statement highlighting 10up for the contribution of the VVV project --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e0d31ea..6c9111c 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ Varying Vagrant Vagrants is an evolving [Vagrant](http://vagrantup.com) configuration focused on [WordPress](http://wordpress.org) development. +VVV is a [10up](http://10up.com) creation and [moved](http://10up.com/blog/varying-vagrant-vagrants-future/) to a community organization in 2014. + * **Version**: 1.1-working * **Latest Stable**: [v1.0](https://github.com/varying-vagrant-vagrants/vvv/tree/v1.0) * **Contributors**: [@jeremyfelt](http://github.com/jeremyfelt), [@carldanley](http://github.com/carldanley), [@ericmann](http://github.com/ericmann), [@lkwdwrd](http://github.com/lkwdwrd), [@TheLastCicada](http://github.com/TheLastCicada), [@tddewey](http://github.com/tddewey), [@johnpbloch](http://github.com/johnpbloch), [@kadamwhite](http://github.com/kadamwhite), [@scribu](http://github.com/scribu), [@danielbachhuber](http://github.com/danielbachhuber), [@tollmanz](http://github.com/tollmanz), [@mbijon](http://github.com/mbijon), [@markjaquith](http://github.com/markjaquith), [@curtismchale](http://github.com/curtismchale), [@Mamaduka](http://github.com/mamaduka), [@lgedeon](http://github.com/lgedeon), [@pmgarman](http://github.com/pmgarman), [@westonruter](http://github.com/westonruter), [@petemall](http://github.com/petemall), [@cmmarslender](http://github.com/cmmarslender), [@mintindeed](http://github.com/mintindeed), [@mboynes](http://github.com/mboynes), [@aaronjorbin](http://github.com/aaronjorbin), [@tobiasbg](http://github.com/tobiasbg), [@simonwheatley](http://github.com/simonwheatley), [@ocean90](http://github.com/ocean90), [@lvnilesh](http://github.com/lvnilesh), [@alexw23](http://github.com/alexw23), [@zamoose](https://github.com/zamoose), [@leewillis77](https://github.com/leewillis77), [@imichaeli](https://github.com/imichaeli), [@andrezrv](https://github.com/andrezrv), [@cadwell](https://github.com/cadwell), [@cfoellmann](https://github.com/cfoellmann), [@westi](https://github.com/westi), [@ryanduff](https://github.com/ryanduff), [@selinerdominik](https://github.com/selinerdominik), [@ericandrewlewis](https://github.com/ericandrewlewis), [@vDevices](https://github.com/vDevices), [@sunnyratilal](https://github.com/sunnyratilal), [@enejb](https://github.com/enejb) From e7523f1bb0b0ec08b8d432987c6f74884907f4a6 Mon Sep 17 00:00:00 2001 From: jeremyfelt Date: Mon, 3 Feb 2014 10:07:30 -0800 Subject: [PATCH 29/32] Transitioned sounds better than moved --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c9111c..1e99180 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Varying Vagrant Vagrants is an evolving [Vagrant](http://vagrantup.com) configuration focused on [WordPress](http://wordpress.org) development. -VVV is a [10up](http://10up.com) creation and [moved](http://10up.com/blog/varying-vagrant-vagrants-future/) to a community organization in 2014. +VVV is a [10up](http://10up.com) creation and [transitioned](http://10up.com/blog/varying-vagrant-vagrants-future/) to a community organization in 2014. * **Version**: 1.1-working * **Latest Stable**: [v1.0](https://github.com/varying-vagrant-vagrants/vvv/tree/v1.0) From 0bf5256e596bfc842ba10407cee841cede3f0afc Mon Sep 17 00:00:00 2001 From: Sal Ferrarello Date: Wed, 5 Feb 2014 06:37:07 -0500 Subject: [PATCH 30/32] Added file paths to default dashboard Added file paths to the default dashboard to help clarify which urls load which directories --- www/default/index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/default/index.php b/www/default/index.php index c9471ab..51428c8 100644 --- a/www/default/index.php +++ b/www/default/index.php @@ -28,10 +28,10 @@ From 12f6e12594a0ff09ce63a798d96b5f80f924b4f5 Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Wed, 5 Feb 2014 08:52:28 -0800 Subject: [PATCH 31/32] Update contributors list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e99180..07c918f 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ VVV is a [10up](http://10up.com) creation and [transitioned](http://10up.com/blo * **Version**: 1.1-working * **Latest Stable**: [v1.0](https://github.com/varying-vagrant-vagrants/vvv/tree/v1.0) -* **Contributors**: [@jeremyfelt](http://github.com/jeremyfelt), [@carldanley](http://github.com/carldanley), [@ericmann](http://github.com/ericmann), [@lkwdwrd](http://github.com/lkwdwrd), [@TheLastCicada](http://github.com/TheLastCicada), [@tddewey](http://github.com/tddewey), [@johnpbloch](http://github.com/johnpbloch), [@kadamwhite](http://github.com/kadamwhite), [@scribu](http://github.com/scribu), [@danielbachhuber](http://github.com/danielbachhuber), [@tollmanz](http://github.com/tollmanz), [@mbijon](http://github.com/mbijon), [@markjaquith](http://github.com/markjaquith), [@curtismchale](http://github.com/curtismchale), [@Mamaduka](http://github.com/mamaduka), [@lgedeon](http://github.com/lgedeon), [@pmgarman](http://github.com/pmgarman), [@westonruter](http://github.com/westonruter), [@petemall](http://github.com/petemall), [@cmmarslender](http://github.com/cmmarslender), [@mintindeed](http://github.com/mintindeed), [@mboynes](http://github.com/mboynes), [@aaronjorbin](http://github.com/aaronjorbin), [@tobiasbg](http://github.com/tobiasbg), [@simonwheatley](http://github.com/simonwheatley), [@ocean90](http://github.com/ocean90), [@lvnilesh](http://github.com/lvnilesh), [@alexw23](http://github.com/alexw23), [@zamoose](https://github.com/zamoose), [@leewillis77](https://github.com/leewillis77), [@imichaeli](https://github.com/imichaeli), [@andrezrv](https://github.com/andrezrv), [@cadwell](https://github.com/cadwell), [@cfoellmann](https://github.com/cfoellmann), [@westi](https://github.com/westi), [@ryanduff](https://github.com/ryanduff), [@selinerdominik](https://github.com/selinerdominik), [@ericandrewlewis](https://github.com/ericandrewlewis), [@vDevices](https://github.com/vDevices), [@sunnyratilal](https://github.com/sunnyratilal), [@enejb](https://github.com/enejb) +* **Contributors**: [@jeremyfelt](http://github.com/jeremyfelt), [@carldanley](http://github.com/carldanley), [@ericmann](http://github.com/ericmann), [@lkwdwrd](http://github.com/lkwdwrd), [@TheLastCicada](http://github.com/TheLastCicada), [@tddewey](http://github.com/tddewey), [@johnpbloch](http://github.com/johnpbloch), [@kadamwhite](http://github.com/kadamwhite), [@scribu](http://github.com/scribu), [@danielbachhuber](http://github.com/danielbachhuber), [@tollmanz](http://github.com/tollmanz), [@mbijon](http://github.com/mbijon), [@markjaquith](http://github.com/markjaquith), [@curtismchale](http://github.com/curtismchale), [@Mamaduka](http://github.com/mamaduka), [@lgedeon](http://github.com/lgedeon), [@pmgarman](http://github.com/pmgarman), [@westonruter](http://github.com/westonruter), [@petemall](http://github.com/petemall), [@cmmarslender](http://github.com/cmmarslender), [@mintindeed](http://github.com/mintindeed), [@mboynes](http://github.com/mboynes), [@aaronjorbin](http://github.com/aaronjorbin), [@tobiasbg](http://github.com/tobiasbg), [@simonwheatley](http://github.com/simonwheatley), [@ocean90](http://github.com/ocean90), [@lvnilesh](http://github.com/lvnilesh), [@alexw23](http://github.com/alexw23), [@zamoose](https://github.com/zamoose), [@leewillis77](https://github.com/leewillis77), [@imichaeli](https://github.com/imichaeli), [@andrezrv](https://github.com/andrezrv), [@cadwell](https://github.com/cadwell), [@cfoellmann](https://github.com/cfoellmann), [@westi](https://github.com/westi), [@ryanduff](https://github.com/ryanduff), [@selinerdominik](https://github.com/selinerdominik), [@ericandrewlewis](https://github.com/ericandrewlewis), [@vDevices](https://github.com/vDevices), [@sunnyratilal](https://github.com/sunnyratilal), [@enejb](https://github.com/enejb), [@salcode](https://github.com/salcode) * **Contributing**: Contributions are more than welcome. Please submit pull requests against the [master branch](https://github.com/10up/varying-vagrant-vagrants). Thanks! ## Overview From d9d83bfe7c4707d3c969c7467d8ea59730191483 Mon Sep 17 00:00:00 2001 From: Sal Ferrarello Date: Fri, 7 Feb 2014 06:41:57 -0500 Subject: [PATCH 32/32] Update github URLs to new location in README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 07c918f..f5830fa 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ VVV is a [10up](http://10up.com) creation and [transitioned](http://10up.com/blo * **Version**: 1.1-working * **Latest Stable**: [v1.0](https://github.com/varying-vagrant-vagrants/vvv/tree/v1.0) * **Contributors**: [@jeremyfelt](http://github.com/jeremyfelt), [@carldanley](http://github.com/carldanley), [@ericmann](http://github.com/ericmann), [@lkwdwrd](http://github.com/lkwdwrd), [@TheLastCicada](http://github.com/TheLastCicada), [@tddewey](http://github.com/tddewey), [@johnpbloch](http://github.com/johnpbloch), [@kadamwhite](http://github.com/kadamwhite), [@scribu](http://github.com/scribu), [@danielbachhuber](http://github.com/danielbachhuber), [@tollmanz](http://github.com/tollmanz), [@mbijon](http://github.com/mbijon), [@markjaquith](http://github.com/markjaquith), [@curtismchale](http://github.com/curtismchale), [@Mamaduka](http://github.com/mamaduka), [@lgedeon](http://github.com/lgedeon), [@pmgarman](http://github.com/pmgarman), [@westonruter](http://github.com/westonruter), [@petemall](http://github.com/petemall), [@cmmarslender](http://github.com/cmmarslender), [@mintindeed](http://github.com/mintindeed), [@mboynes](http://github.com/mboynes), [@aaronjorbin](http://github.com/aaronjorbin), [@tobiasbg](http://github.com/tobiasbg), [@simonwheatley](http://github.com/simonwheatley), [@ocean90](http://github.com/ocean90), [@lvnilesh](http://github.com/lvnilesh), [@alexw23](http://github.com/alexw23), [@zamoose](https://github.com/zamoose), [@leewillis77](https://github.com/leewillis77), [@imichaeli](https://github.com/imichaeli), [@andrezrv](https://github.com/andrezrv), [@cadwell](https://github.com/cadwell), [@cfoellmann](https://github.com/cfoellmann), [@westi](https://github.com/westi), [@ryanduff](https://github.com/ryanduff), [@selinerdominik](https://github.com/selinerdominik), [@ericandrewlewis](https://github.com/ericandrewlewis), [@vDevices](https://github.com/vDevices), [@sunnyratilal](https://github.com/sunnyratilal), [@enejb](https://github.com/enejb), [@salcode](https://github.com/salcode) -* **Contributing**: Contributions are more than welcome. Please submit pull requests against the [master branch](https://github.com/10up/varying-vagrant-vagrants). Thanks! +* **Contributing**: Contributions are more than welcome. Please submit pull requests against the [master branch](https://github.com/Varying-Vagrant-Vagrants/VVV). Thanks! ## Overview @@ -65,7 +65,7 @@ Immediate goals for VVV include: * Note: This step is not a requirement, though it does make the process of starting up a virtual machine nicer by automating the entries needed in your local machine's `hosts` file to access the provisioned VVV domains in your browser. * If you choose not to install this plugin, a manual entry should be added to your local `hosts` file that looks like this: `192.168.50.4 vvv.dev local.wordpress.dev local.wordpress-trunk.dev src.wordpress-develop.dev build.wordpress-develop.dev` 1. Clone or extract the Varying Vagrant Vagrants project into a local directory - * `git clone git://github.com/10up/varying-vagrant-vagrants.git vagrant-local` + * `git clone git://github.com/Varying-Vagrant-Vagrants/VVV.git vagrant-local` * OR download and extract the repository master [zip file](https://github.com/varying-vagrant-vagrants/vvv/archive/master.zip) * OR grab a [stable release](https://github.com/varying-vagrant-vagrants/vvv/releases) if you'd like some extra comfort. 1. Change into the new directory with `cd vagrant-local` @@ -100,7 +100,7 @@ On future runs of `vagrant up`, the packaged box will be cached on your local ma Now that you're up and running, start poking around and modifying things. 1. Access the server via the command line with `vagrant ssh` from your `vagrant-local` directory. You can do almost anything you would do with a standard Ubuntu installation on a full server. - * **MS Windows users:** An SSH client is generally not distributed with Windows PCs by default. However, a terminal emulator such as [PuTTY](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html) will provide access immediately. For detailed instructions on connecting with PuTTY, consult the [VVV Wiki](https://github.com/10up/varying-vagrant-vagrants/wiki/Connect-to-Your-Vagrant-Virtual-Machine-with-PuTTY). + * **MS Windows users:** An SSH client is generally not distributed with Windows PCs by default. However, a terminal emulator such as [PuTTY](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html) will provide access immediately. For detailed instructions on connecting with PuTTY, consult the [VVV Wiki](https://github.com/Varying-Vagrant-Vagrants/VVV/wiki/Connect-to-Your-Vagrant-Virtual-Machine-with-PuTTY). 1. Power off the box with `vagrant halt` and turn it back on with `vagrant up`. 1. Suspend the box's state in memory with `vagrant suspend` and bring it right back with `vagrant resume`. 1. Reapply provisioning to a running box with `vagrant provision`.