merge master

.gitignore

@@ -1 +1,4 @@
+.DS_Store
+.bundle
+.idea/
 .vagrant

Vagrantfile

@@ -14,6 +14,16 @@ Vagrant.configure(2) do |config|
     ).read
   )
 
+  if File.exists?(File.join(ENV["HOME"], '.vccw/config.yml'))
+    _custom = YAML.load(
+      File.open(
+        File.join(ENV["HOME"], '.vccw/config.yml'),
+        File::RDONLY
+      ).read
+    )
+    _conf.merge!(_custom) if _custom.is_a?(Hash)
+  end
+
   if File.exists?(File.join(File.dirname(__FILE__), 'site.yml'))
     _site = YAML.load(
       File.open(
@@ -42,7 +52,7 @@ Vagrant.configure(2) do |config|
   config.vm.network :private_network, ip: _conf['ip']
 
   config.vm.synced_folder ".", "/vagrant", :mount_options => ['dmode=755', 'fmode=644']
-  config.vm.synced_folder "www/wordpress/", _conf['document_root'], :create => "true", :mount_options => ['dmode=755', 'fmode=644']
+  config.vm.synced_folder _conf['sync_folder'], _conf['document_root'], :create => "true", :mount_options => ['dmode=755', 'fmode=644']
 
   if Vagrant.has_plugin?('vagrant-hostsupdater')
     config.hostsupdater.remove_on_suspend = true

provision/cookbooks/rbenv/attributes/default.rb

@@ -20,7 +20,7 @@
 #
 
 # git repository containing rbenv
-default['rbenv']['git_url'] = "git://github.com/sstephenson/rbenv.git"
+default['rbenv']['git_url'] = "https://github.com/sstephenson/rbenv.git"
 default['rbenv']['git_ref'] = "v0.4.0"
 
 # upgrade action strategy

provision/default.yml

@@ -12,22 +12,23 @@ chef_cookbook_path: ./provision
 #
 hostname: wordpress.local
 ip: 192.168.33.10
+sync_folder: 'www/wordpress'
 
 #
 # WordPress Settings
 #
 version: latest
 lang: en_US
-title: Welcome to the Vagrant
+title: Welcome to the VCCW
 multisite: false
 rewrite_structure: /archives/%post_id%
 
 #
 # WordPress Path
 #
 document_root: '/var/www/wordpress'
-wp_home: ''
-wp_siteurl: ''
+wp_home: ''     # Path to the WP_HOME like "wp"
+wp_siteurl: ''  # Path to the WP_SITEURL like "wp"
 
 #
 # WordPress User
@@ -43,6 +44,7 @@ db_host: localhost
 
 #
 # WordPress Default Plugins
+# Plugin's slug or url to the plugin's slug.
 #
 plugins:
   - dynamic-hostname
@@ -51,6 +53,7 @@ plugins:
 
 #
 # WordPress Default Theme
+# Theme's slug or url to the theme's .zip.
 #
 theme: ''
 
@@ -78,4 +81,3 @@ theme_unit_test_uri: https://wpcom-themes.svn.automattic.com/demo/theme-unit-tes
 # DB will be reset when provision
 #
 reset_db_on_provision: true
-

provision/site-cookbooks/vccw/templates/default/Movefile.erb

@@ -17,6 +17,7 @@ staging:
     user: "user"
     password: "password"
     host: "localhost"
+    charset: "utf8"
 
   exclude:
     - ".git/"

provision/site-cookbooks/wpcli/attributes/default.rb

@@ -1,6 +1,6 @@
 #
 # Cookbook Name:: wpcli
-# Attributes:: deafault
+# Attributes:: default
 #
 # Author:: Takayuki Miyauchi
 # License: MIT

provision/site-cookbooks/wpcli/recipes/default.rb

@@ -10,7 +10,7 @@
 end
 
 git node[:wpcli][:dir] do
-  repository "git://github.com/wp-cli/builds.git"
+  repository "https://github.com/wp-cli/builds.git"
   action :sync
 end
 
@@ -47,7 +47,7 @@
 end
 
 git 'home/vagrant/.wp-cli/commands/dictator' do
-  repository "git://github.com/danielbachhuber/dictator.git"
+  repository "https://github.com/danielbachhuber/dictator.git"
   user node[:wpcli][:user]
   group node[:wpcli][:group]
   action :sync