diff --git a/README.md b/README.md index cd6e5d6..f3ec4e6 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,12 @@ Varying Vagrant Vagrants is an evolving [Vagrant](http://vagrantup.com) configuration focused on [WordPress](http://wordpress.org) development. -* **Version**: 1.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) -* **Contributing**: Contributions are more than welcome. Please submit pull requests against the [master branch](https://github.com/10up/varying-vagrant-vagrants). Thanks! +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) +* **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/Varying-Vagrant-Vagrants/VVV). Thanks! ## Overview @@ -27,11 +30,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. @@ -62,9 +65,9 @@ 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` - * 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. + * `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` 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. @@ -97,12 +100,12 @@ 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`. 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 @@ -131,7 +134,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? @@ -158,7 +161,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 @@ -167,7 +170,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 diff --git a/config/mysql-config/my.cnf b/config/mysql-config/my.cnf index 6023060..57f4dbf 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 @@ -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] diff --git a/config/php5-fpm-config/php-custom.ini b/config/php5-fpm-config/php-custom.ini index 8d69ebb..fa6942c 100644 --- a/config/php5-fpm-config/php-custom.ini +++ b/config/php5-fpm-config/php-custom.ini @@ -1,121 +1,53 @@ +; 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. -; 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 diff --git a/config/phpunit-composer.json b/config/phpunit-composer.json deleted file mode 100644 index 616cc30..0000000 --- a/config/phpunit-composer.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "vvv-phpunit", - "description": "VVV Global Composer packages", - "require": { - "phpunit/phpunit": "3.7.*", - "mockery/mockery": "0.8.0", - "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 2d291db..5699482 100755 --- a/provision/provision.sh +++ b/provision/provision.sh @@ -74,6 +74,7 @@ apt_package_check_list=( imagemagick subversion git-core + zip unzip ngrep curl @@ -191,53 +192,25 @@ 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 - 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 '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 - vvvphpunit_update=1 - fi - cd ~/ - fi - if [[ "$vvvphpunit_update" = 1 ]]; then - echo "Update PHPUnit, Hamcrest and Mockery..." - cp /srv/config/phpunit-composer.json /usr/local/src/vvv-phpunit/composer.json - sh -c "cd /usr/local/src/vvv-phpunit && composer update" + 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 + COMPOSER_HOME=/usr/local/src/composer composer global update fi # 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" @@ -453,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 @@ -513,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.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.3/phpMyAdmin-4.1.3-all-languages.tar.gz/download' tar -xf phpmyadmin.tar.gz - mv phpMyAdmin-4.0.10-all-languages database-admin + mv phpMyAdmin-4.1.3-all-languages database-admin rm phpmyadmin.tar.gz else echo "PHPMyAdmin already installed." diff --git a/www/default/index.php b/www/default/index.php index 980d35d..51428c8 100644 --- a/www/default/index.php +++ b/www/default/index.php @@ -28,10 +28,10 @@ - \ No newline at end of file +