merge master

vccw-team · Feb 23, 2015 · d4e1d88 · d4e1d88
2 parents 4a93232 + e3eafb3
commit d4e1d88
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -115,6 +115,7 @@ Vagrant.configure(2) do |config|
         :locale            => ENV['wp_lang'] || _conf['lang'],
         :admin_user        => _conf['admin_user'],
         :admin_password    => _conf['admin_pass'],
+        :admin_email       => _conf['admin_email'],
         :default_plugins   => _conf['plugins'],
         :default_theme     => _conf['theme'],
         :title             => _conf['title'],

diff --git a/provision/default.yml b/provision/default.yml
@@ -35,6 +35,7 @@ wp_siteurl: ''  # Path to the WP_SITEURL like "wp"
 #
 admin_user: admin
 admin_pass: admin
+admin_email: vccw@example.com
 
 #
 # WordPress Database