Merge branch 'master' into release

vccw-team · Aug 9, 2015 · 1756834 · 1756834
2 parents b439e75 + 66212e1
commit 1756834
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 40 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -176,6 +176,10 @@ Vagrant.configure(2) do |config|
             {
               name: 'wordmove',
               options: '--no-ri --no-rdoc'
+            },
+            {
+              name: 'mailcatcher',
+              options: '--no-ri --no-rdoc'
             }
           ]
         }

diff --git a/provision/site-cookbooks/vccw/recipes/default.rb b/provision/site-cookbooks/vccw/recipes/default.rb
@@ -3,18 +3,18 @@
 
 require 'shellwords'
 
-include_recipe 'ruby_build'
-include_recipe 'rbenv::system'
-include_recipe 'vccw::phpenv'
-
-packages = %w{gettext subversion npm lftp sshpass}
+packages = %w{gettext subversion npm lftp sshpass sqlite-devel}
 
 packages.each do |pkg|
   package pkg do
     action [:install, :upgrade]
   end
 end
 
+include_recipe 'ruby_build'
+include_recipe 'rbenv::system'
+include_recipe 'vccw::phpenv'
+
 #
 # Setup WordPress i18n Tools
 #

diff --git a/provision/site-cookbooks/wpcli/recipes/install.rb b/provision/site-cookbooks/wpcli/recipes/install.rb
@@ -11,14 +11,7 @@
 
 service "iptables" do
   supports :status => true, :restart => true
-  action [:enable, :start]
-end
-
-template "/etc/sysconfig/iptables" do
-  source "wordpress-iptables.erb"
-  owner "root"
-  group "root"
-  mode "0600"
+  action [:disable, :stop]
 end
 
 execute "mysql-install-wp-privileges" do

diff --git a/provision/site-cookbooks/wpcli/templates/default/wordpress-iptables.erb b/provision/site-cookbooks/wpcli/templates/default/wordpress-iptables.erb