diff --git a/Vagrantfile b/Vagrantfile index c60fb97..9b405cf 100644 --- 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 index 200beba..2a2e48e 100644 --- a/provision/site-cookbooks/vccw/recipes/default.rb +++ b/provision/site-cookbooks/vccw/recipes/default.rb @@ -3,11 +3,7 @@ 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 @@ -15,6 +11,10 @@ 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 index 4c40d4f..cb8d0a6 100644 --- 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 deleted file mode 100644 index a50aec8..0000000 --- a/provision/site-cookbooks/wpcli/templates/default/wordpress-iptables.erb +++ /dev/null @@ -1,27 +0,0 @@ -*filter -:INPUT DROP -:FORWARD DROP -:OUTPUT ACCEPT -:FWR - --A INPUT -j FWR --A FWR -i lo -j ACCEPT - -# Any established connection is money --A FWR -m state --state RELATED,ESTABLISHED -j ACCEPT - -# ICMP --A FWR -p icmp -j ACCEPT -# HTTP --A FWR -m tcp -p tcp --dport 80 -j ACCEPT --A FWR -m tcp -p tcp --dport 443 -j ACCEPT - -# MySQL --A FWR -m tcp -p tcp --dport 3306 -j ACCEPT - -# SSH --A FWR -m tcp -p tcp --dport 22 -j ACCEPT - -# Rejects all remaining connections with port-unreachable errors. --A FWR -p tcp -m tcp --tcp-flags SYN,RST,ACK SYN -j REJECT --reject-with icmp-port-unreachable --A FWR -p udp -j REJECT --reject-with icmp-port-unreachable -COMMIT