Trigger apache2 logdir mount and fix logdir on Amazon Linux.

bigplants · Aug 2, 2013 · 402ab7e · 402ab7e
1 parent d99a4db
commit 402ab7e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/apache2/recipes/default.rb b/apache2/recipes/default.rb
@@ -182,8 +182,9 @@
 # uncomment to get working example site on centos/redhat/fedora/amazon
 #apache_site 'default'
 
-service 'apache2' do
-  action :start
+execute "check existence of #{node[:apache][:log_dir]}" do
+  command "ls -la #{node[:apache][:log_dir]}"
+  notifies :start, resources(:service => 'apache2')
 end
 
 file "#{node[:apache][:document_root]}/index.html" do

diff --git a/opsworks_initial_setup/attributes/default.rb b/opsworks_initial_setup/attributes/default.rb
@@ -46,9 +46,14 @@
 default[:opsworks_initial_setup][:bind_mounts][:mounts] = {
   "/srv/www" => "/mnt/srv/www",
   "/var/www" => "/mnt/var/www",
-  "/var/log/apache2" => "/mnt/var/log/apache2",
   "/var/log/mysql" => "/mnt/var/log/mysql"
 }
+case node[:platform]
+when 'redhat','centos','fedora','amazon'
+  default[:opsworks_initial_setup][:bind_mounts][:mounts]["/var/log/httpd"] = "/mnt/var/log/apache2"
+when 'debian','ubuntu'
+  default[:opsworks_initial_setup][:bind_mounts][:mounts]["/var/log/apache2"] = "/mnt/var/log/apache2"
+end
 
 # landscape removal
 default[:opsworks_initial_setup][:landscape][:packages_to_remove] = ['landscape-common', 'landscape-client']