Merge pull request #1921 from Varying-Vagrant-Vagrants/develop

3.1.1

.github/CONTRIBUTING.md

@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: default
 title: Contributing to VVV
 permalink: /docs/en-US/contributing/
 ---

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,47 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+<!--- Hello! Thanks for using VVV and taking the time to open an issue. -->
+<!--- Please use the Title field to provide a clear summary of the issue. -->
+<!-- Have you tried the develop branch? Your problem might already be fixed! -->
+
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+<!-- If there is an issue during provisioning, it can often be helpful to see a full log of
+the output displayed during provisioning. If this is available, please copy and paste the
+log into a gist at gist.github.com and paste the link here. -->
+
+## Your Environment
+
+<!--- We need to know your machine setup to help -->
+<!-- If you don't know it, copy paste the splash screen with the colourful VVV logo from the terminal, it has everything we need to know to help you -->
+
+
+## Logs
+
+<!-- give us a full log of the provision, a copy paste from the terminal will do, or a gist, just remember to put it in code block tags with 3 backticks before and after, don't forget the splash screen with the logo! -->
+<!-- Also, your `vvv-custom.yml` would be super handy -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'feature'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/problems-provisioning-windows.md

@@ -0,0 +1,57 @@
+---
+name: Problems Provisioning on Windows
+about: For when running vagrant up --provision or vagrant provision
+title: ''
+labels: 'Windows'
+assignees: ''
+
+---
+
+<!--- Hello! Thanks for using VVV and taking the time to open an issue. -->
+<!--- Please use the Title field to provide a clear summary of the issue. -->
+<!-- Have you tried the develop branch? Your problem might already be fixed! -->
+
+## What was The Command Used To Provision?
+
+```shell
+command goes here
+```
+
+## What Kind of VVV Provision Was This?
+
+<!-- delete all but one: -->
+This was a fresh install
+This was an attempt to upgrade to a new version of VVV
+This was a reprovision of an already working VVV
+
+## Logs/What Broke?
+
+<!---
+If describing a bug, tell us what happens instead of the expected behavior.
+
+Provisioner logs would be super helpful, copy paste the entire log including the VVV logo into a code block, or link to a gist
+
+Also, your `vvv-custom.yml` would be super handy -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+<!-- If there is an issue during provisioning, it can often be helpful to see a full log of
+the output displayed during provisioning. If this is available, please copy and paste the
+log into a gist at gist.github.com and paste the link here. -->
+
+## Your Environment
+
+Operating System: Windows
+
+<!--- We need to know your machine setup to help -->
+<!-- If you don't know it, copy paste the splash screen with the colourful VVV logo from the terminal, it has everything we need to know to help you -->

.github/ISSUE_TEMPLATE/problems-provisioning.md

@@ -0,0 +1,55 @@
+---
+name: Problems Provisioning
+about: For when running vagrant up --provision or vagrant provision
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--- Hello! Thanks for using VVV and taking the time to open an issue. -->
+<!--- Please use the Title field to provide a clear summary of the issue. -->
+<!-- Have you tried the develop branch? Your problem might already be fixed! -->
+
+## What was The Command Used To Provision?
+
+```shell
+command goes here
+```
+
+## What Kind of VVV Provision Was This?
+
+<!-- delete all but one: -->
+This was a fresh install
+This was an attempt to upgrade to a new version of VVV
+This was a reprovision of an already working VVV
+
+## Logs/What Broke?
+
+<!---
+If describing a bug, tell us what happens instead of the expected behavior.
+
+Provisioner logs would be super helpful, copy paste the entire log including the VVV logo into a code block, or link to a gist
+
+Also, your `vvv-custom.yml` would be super handy -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+<!-- If there is an issue during provisioning, it can often be helpful to see a full log of
+the output displayed during provisioning. If this is available, please copy and paste the
+log into a gist at gist.github.com and paste the link here. -->
+
+## Your Environment
+
+<!--- We need to know your machine setup to help -->
+<!-- If you don't know it, copy paste the splash screen with the colourful VVV logo from the terminal, it has everything we need to know to help you -->

.github/ISSUE_TEMPLATE/support.md

@@ -0,0 +1,15 @@
+---
+name: Support/Question
+about: Having Trouble? Unsure of how something works? Don't spend all day trying to debug it, we can help!
+title: ''
+labels: 'support, question'
+assignees: ''
+
+---
+
+<!-- Tell us what's happening, include as much detail as you can, and include full logs if you're having troubles
+if needed, ping someone on slack with a link to the issue.
+
+If you've given up and gone elsewhere, report it anyway and we can work to make sure it never happens again.
+
+Thank again for using VVV, and helping out!! -->

CHANGELOG.md

@@ -4,7 +4,28 @@ title: Changelog
 permalink: /docs/en-US/changelog/
 ---
 
-## 3.1.0 ( TBD 2019 )
+## 3.1.1 ( 2019 August 6th )
+
+This is a quick update that changes a default parameter when undefined. In VVV 2 the database was stored inside the VM, and in VVV 3 we put it in a shared folder. This didn't work for some people, so we added a config option to disable this. If this option wasn't set, VVV would use the shared folder.
+
+In v3.1.1 if the option isn't set, it will instead store the database inside the VM. This makes it work out of the box for everybody. If you have a working VVV with the shared folder, you can restore this behaviour by setting `db_share_type: true` in `vvv-custom.yml` and reprovisioning, see `vvv-config.yml` for an example of where this setting goes
+
+### Enhancements
+
+ - Improved the default `vvv-config.yml` to show new site template parameters
+ = VVV installs less out of the box with a simplified `vvv-config.yml`, uncomment utilities to add software back in
+
+### Bug Fixes
+
+ - Fixes the grunt installation
+ - Fixes to file permissions in the `/vagrant` folder
+ - Removed typos in the readme
+ - Switched to a new box for VMWare
+ - Shared folder warning fixes for VMWare
+ - Trailing whitespace removed from the editorconfig file
+ - Visiting the dashboard before it's provisioned now no longer gives a PHP error
+
+## 3.1.0 ( 2019 July 4th )
 
 This is primarily a reliability update. Note that updating to v3.1 requires a `vagrant destroy` and a `vagrant up --provision`. If you've turned off shared database folders, backup beforehand.
 

README.md

@@ -1,6 +1,6 @@
 # Varying Vagrant Vagrants ( VVV )
 
-VVV is local developer environment, mainly aimed at [WordPress](https://wordpress.org) developers. It uses [Vagrant](https://www.vagrantup.com) and VirtualBox, and can be used to build sites and contribute to WordPress.
+VVV is a local developer environment, mainly aimed at [WordPress](https://wordpress.org) developers. It uses [Vagrant](https://www.vagrantup.com) and VirtualBox, and can be used to build sites and contribute to WordPress.
 
 ## How To Use
 

Vagrantfile

@@ -509,20 +509,34 @@ Vagrant.configure("2") do |config|
   config.vm.provision "file", source: "#{vagrant_dir}/vvv-custom.yml", destination: "/home/vagrant/vvv-custom.yml"
   $script = <<-SCRIPT
 # cleanup
-rm -rf /vagrant/* 
 mkdir -p /vagrant
+# change ownership for /vagrant folder
+sudo chown -R vagrant:vagrant /vagrant
+
+rm -f /vagrant/provisioned_at
+rm -f /vagrant/version
+rm -f /vagrant/vvv-custom.yml
+
 touch /vagrant/provisioned_at
 echo `date "+%Y%m%d-%H%M%S"` > /vagrant/provisioned_at
+
 # copy over version and config files
 cp -f /home/vagrant/version /vagrant
 cp -f /home/vagrant/vvv-custom.yml /vagrant
 
+sudo chmod 0644 /vagrant/vvv-custom.yml
+sudo chmod 0644 /vagrant/version
+sudo chmod 0644 /vagrant/provisioned_at
+
 # symlink the certificates folder for older site templates compat
-ln -s /srv/certificates /vagrant/certificates
+if [[ ! -d /vagrant/certificates ]]; then
+  ln -s /srv/certificates /vagrant/certificates
+fi
+
+# fix no tty warnings in provisioner logs
 sudo sed -i '/tty/!s/mesg n/tty -s \\&\\& mesg n/' /root/.profile
 
-# change ownership for /vagrant folder
-sudo chown -R vagrant:vagrant /vagrant
+
 SCRIPT
 
   config.vm.provision "initial-setup", type: "shell" do |s|
@@ -535,13 +549,13 @@ SCRIPT
   # This directory is used to maintain default database scripts as well as backed
   # up MariaDB/MySQL dumps (SQL files) that are to be imported automatically on vagrant up
   config.vm.synced_folder "database/sql/", "/srv/database"
-  use_db_share = true
+  use_db_share = false
 
   if defined? vvv_config['general']['db_share_type'] then
-    if vvv_config['general']['db_share_type'] != false then
-      use_db_share = true
-    else
+    if vvv_config['general']['db_share_type'] != true then
       use_db_share = false
+    else
+      use_db_share = true
     end
   end
   if use_db_share == true then

provision/provision.sh

@@ -438,6 +438,7 @@ latest_github_release() {
 }
 
 tools_install() {
+  echo " * Running tools_install"
   # Disable xdebug before any composer provisioning.
   sh /srv/config/homebin/xdebug_off
 
@@ -513,19 +514,21 @@ tools_install() {
 
 
   function install_grunt() {
-    echo "Installing Grunt CLI"
-    noroot npm install -g grunt grunt-cli --no-optional
-    hack_avoid_gyp_errors & noroot npm install -g grunt-sass --no-optional; touch /tmp/stop_gyp_hack
-    noroot npm install -g grunt-cssjanus --no-optional
-    noroot npm install -g grunt-rtlcss --no-optional
+    echo " * Installing Grunt CLI"
+    npm install -g grunt grunt-cli --no-optional
+    hack_avoid_gyp_errors & npm install -g grunt-sass --no-optional; touch /tmp/stop_gyp_hack
+    npm install -g grunt-cssjanus --no-optional
+    npm install -g grunt-rtlcss --no-optional
+    echo " * Installed Grunt CLI"
   }
 
   function update_grunt() {
-    echo "Updating Grunt CLI"
+    echo " * Updating Grunt CLI"
     npm update -g grunt grunt-cli --no-optional
     hack_avoid_gyp_errors & npm update -g grunt-sass; touch /tmp/stop_gyp_hack
     npm update -g grunt-cssjanus --no-optional
     npm update -g grunt-rtlcss --no-optional
+    echo " * Updated Grunt CLI"
   }
   # Grunt
   #
@@ -550,9 +553,9 @@ tools_install() {
   }
   chown -R vagrant:vagrant /usr/lib/node_modules/
   if command -v grunt >/dev/null 2>&1; then
-    install_grunt
-  else
     update_grunt
+  else
+    install_grunt
   fi
 
   # Graphviz

version

@@ -1 +1 @@
-3.1.0
+3.1.1