Removing the master and slave phrasing

.gitignore

@@ -4,3 +4,5 @@
 */.DS_Store
 */*/.DS_Store
 .vagrant
+.idea
+.redcar

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2010 Peritor GmbH
+Copyright 2010-2011 Peritor GmbH
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

Rakefile

@@ -12,6 +12,58 @@ task :validate_literal_includes do
   end
 end
 
+KNOWN_COOKBOOK_ATTRIBUTES = {
+  'scalarium_agent_root' => 'scalarium_cluster_state',
+  'passenger' => 'passenger_apache2',
+  'ganglia' => 'scalarium_ganglia',
+  'sudoers' => 'ssh_users',
+  'scalarium' => :any,
+  'platform' => :any,
+  'platform_version' => :any
+}
+
+desc 'check declared attribute dependencies'
+task :validate_attribute_dependencies do
+  Dir['**/*.rb'].each do |file|
+    next unless file.match(/\/attributes\//)
+    used_cookbook_attributes = []
+    found_trouble = false
+
+    cookbook_name = file.match(/(\w+)\//)[1]
+    loaded_cookbook_attributes = [cookbook_name]
+
+    attribute_file = File.read(file)
+    attribute_file.each do |line|
+
+      # uses other cookbooks attributes
+      if line.match(/node\[\:(\w+)\]/) && $1 != cookbook_name
+        used_cookbook_attributes << $1
+      end
+
+      # loads/includes attributes
+      if line.match(/include_attribute [\'\"](\w+)[\'\"]/) || line.match(/include_attribute [\'\"](\w+)::\w+[\'\"]/)
+        loaded_cookbook_attributes << $1
+      end
+    end
+
+    used_cookbook_attributes.uniq!
+    loaded_cookbook_attributes.uniq!
+
+    used_cookbook_attributes_without_include = used_cookbook_attributes - loaded_cookbook_attributes
+
+    used_cookbook_attributes_without_include.delete_if{|cookbook_attribute| KNOWN_COOKBOOK_ATTRIBUTES[cookbook_attribute] == :any || loaded_cookbook_attributes.include?(KNOWN_COOKBOOK_ATTRIBUTES[cookbook_attribute]) }
+
+    if used_cookbook_attributes_without_include.size > 0
+      puts "#{file} used attributes from #{used_cookbook_attributes.inspect} but does only loads from #{loaded_cookbook_attributes.inspect}"
+      found_trouble = true
+    end
+
+    if found_trouble
+      exit 1
+    end
+  end
+end
+
 desc 'check syntax of ruby files'
 task :validate_syntax do
   Dir['**/*.rb'].each do |file|
@@ -24,4 +76,4 @@ task :validate_syntax do
 end
 
 desc 'run all checks'
-task :default => [:validate_literal_includes, :validate_syntax]
+task :default => [:validate_literal_includes, :validate_syntax, :validate_attribute_dependencies]

agent_version/recipes/default.rb

@@ -1,8 +1,9 @@
-template '/root/scalarium-agent/TARGET_VERSION' do
+template "#{node[:scalarium_agent_root]}/TARGET_VERSION" do
   cookbook 'agent_version'
   source 'TARGET_VERSION.erb'
-  owner 'root'
-  group 'root'
+  backup false
+  owner 'scalarium-agent'
+  group 'scalarium-agent'
   mode 0600
   variables :version => node.scalarium.agent_version
 end

apache2/attributes/apache.rb

@@ -77,4 +77,7 @@
 # logrotate
 default[:apache][:logrotate][:schedule] = 'daily'
 default[:apache][:logrotate][:rotate] = '30'
-default[:apache][:logrotate][:delaycompress] = true
+default[:apache][:logrotate][:delaycompress] = true
+default[:apache][:logrotate][:mode] = '640'
+default[:apache][:logrotate][:owner] = 'root'
+default[:apache][:logrotate][:group] = 'adm'

apache2/definitions/web_app.rb

@@ -26,23 +26,9 @@
   include_recipe "apache2::mod_deflate"
   include_recipe "apache2::mod_headers"
 
-  ruby_block 'Detect includes for vhost' do
-    inner_params = params
-    inner_application_name = application_name
-    inner_node = node
-
-    block do
-      if File.exists?(local_config = "#{inner_node[:apache][:dir]}/sites-available/#{inner_application_name}.conf.d/local")
-        Chef::Log.info("local config for #{inner_application_name} detected")
-        inner_params[:local_config] = local_config
-      end
-
-      if File.exists?(rewrite_config = "#{inner_node[:apache][:dir]}/sites-available/#{inner_application_name}.conf.d/rewrite")
-        Chef::Log.info("rewrite config for #{inner_application_name} detected")
-        inner_params[:rewrite_config] = rewrite_config
-      end
-    end
-  end
+  directory "#{node[:apache][:dir]}/sites-available/#{application_name}.conf.d"
+  params[:rewrite_config] = "#{node[:apache][:dir]}/sites-available/#{application_name}.conf.d/rewrite"
+  params[:local_config] = "#{node[:apache][:dir]}/sites-available/#{application_name}.conf.d/local"
 
   template "#{node[:apache][:dir]}/sites-available/#{application_name}.conf" do
     Chef::Log.debug("Generating Apache site template for #{application_name.inspect}")

apache2/recipes/stop.rb

@@ -0,0 +1,5 @@
+include_recipe "apache2::service"
+
+service "apache2" do
+  action :stop
+end

apache2/recipes/uninstall.rb

@@ -0,0 +1,11 @@
+if File.exists?("/etc/init.d/apache2")
+  include_recipe "apache2::service"
+
+  service "apache2" do
+    action :stop
+  end
+
+  package "apache2" do
+    action :remove
+  end
+end

apache2/templates/default/logrotate.erb

@@ -7,7 +7,7 @@
         delaycompress
         <% end -%>
         notifempty
-        create 640 root adm
+        create <%= node[:apache][:logrotate][:mode] %> <%= node[:apache][:logrotate][:owner] %> <%= node[:apache][:logrotate][:group] %>
         sharedscripts
         postrotate
                 if [ -f "`. /etc/apache2/envvars ; echo ${APACHE_PID_FILE:-/var/run/apache2.pid}`" ]; then

dependencies/attributes/default.rb

@@ -1,5 +1,6 @@
 default[:dependencies][:gems] = {}
 default[:dependencies][:debs] = {}
+default[:dependencies][:npms] = {}
 default[:dependencies][:update_debs] = false
 default[:dependencies][:upgrade_debs] = false
 default[:dependencies][:upgrade_gems] = false

dependencies/libraries/current_gem_version.rb

@@ -0,0 +1,25 @@
+module Scalarium
+  module GemSupport
+    require 'rubygems/version'
+
+    def ensure_only_gem_version(name, ensured_version)
+      versions = `#{node[:dependencies][:gem_binary]} list #{name}`
+      versions = versions.scan(/(\d[a-zA-Z0-9\.]*)/).flatten.compact
+      for version in versions
+        next if version == ensured_version
+        Chef::Log.info("Uninstalling version #{version} of Rubygem #{name}")
+        system("#{node[:dependencies][:gem_binary]} uninstall #{name} -v=#{version}")
+      end
+      if versions.include?(ensured_version)
+        Chef::Log.info("Skipping installation of version #{ensured_version} of Rubygem #{name}: already installed")
+      else
+        Chef::Log.info("Installing version #{ensured_version} of Rubygem #{name}")
+        system("#{node[:dependencies][:gem_binary]} install #{name} -v=#{ensured_version} --no-ri --no-rdoc")
+      end
+    end
+  end
+end
+
+class Chef::Resource
+  include Scalarium::GemSupport
+end

dependencies/recipes/default.rb

@@ -23,13 +23,6 @@
     retries 2
     gem_binary node[:dependencies][:gem_binary]
     options "--no-ri --no-rdoc"
-    only_if do
-      raise "Could not find a candidate version to install for Gem: #{gem_name} - No such gem?" unless gem_available?(gem_name)
-      if new_gem_version_available?(gem_name)
-        Chef::Log.info("Installing new version of #{gem_name.inspect}")
-        true
-      end
-    end
   end
 end
 

deploy/attributes/default.rb

@@ -0,0 +1 @@
+include_attribute "deploy::deploy"

deploy/attributes/deploy.rb

@@ -1,10 +1,20 @@
+include_attribute 'deploy::logrotate'
+include_attribute 'deploy::rails_stack'
+
+default[:scalarium][:deploy_user][:shell] = '/bin/zsh'
+default[:scalarium][:deploy_user][:user] = 'deploy'
+default[:scalarium][:deploy_user][:group] = 'www-data'
+
+default[:scalarium][:rails][:ignore_bundler_groups] = ['test', 'development']
+
 default[:deploy] = {}
 node[:deploy].each do |application, deploy|
   default[:deploy][application][:deploy_to] = "/srv/www/#{application}"
   default[:deploy][application][:release] = Time.now.utc.strftime("%Y%m%d%H%M%S")
   default[:deploy][application][:release_path] = "#{node[:deploy][application][:deploy_to]}/releases/#{node[:deploy][application][:release]}"
   default[:deploy][application][:current_path] = "#{node[:deploy][application][:deploy_to]}/current"
   default[:deploy][application][:document_root] = ""
+  default[:deploy][application][:ignore_bundler_groups] = node[:scalarium][:rails][:ignore_bundler_groups]
   if deploy[:document_root]
     default[:deploy][application][:absolute_document_root] = "#{default[:deploy][application][:current_path]}/#{deploy[:document_root]}/"
   else
@@ -19,33 +29,39 @@
     default[:deploy][application][:rake] = "rake"
   end
   default[:deploy][application][:migrate] = false
-  default[:deploy][application][:migrate_command] = "#{default[:deploy][application][:rake]} db:migrate"
+  if node[:deploy][application][:auto_bundle_on_deploy]
+    default[:deploy][application][:migrate_command] = "if [ -f Gemfile ]; then echo 'Scalarium: Gemfile found - running migration with bundle exec' && bundle exec #{node[:deploy][application][:rake]} db:migrate; else echo 'Scalarium: no Gemfile - running plain migrations' && #{node[:deploy][application][:rake]} db:migrate; fi"
+  else
+    default[:deploy][application][:migrate_command] = "#{node[:deploy][application][:rake]} db:migrate"
+  end
   default[:deploy][application][:rails_env] = 'production'
   default[:deploy][application][:action] = 'deploy'
-  default[:deploy][application][:user] = 'deploy'
-  default[:deploy][application][:group] = 'www-data'
-  default[:deploy][application][:shell] = '/bin/zsh'
+  default[:deploy][application][:user] = node[:scalarium][:deploy_user][:user]
+  default[:deploy][application][:group] = node[:scalarium][:deploy_user][:group]
+  default[:deploy][application][:shell] = node[:scalarium][:deploy_user][:shell]
   home = self[:passwd] && 
          self[:passwd][self[:deploy][application][:user]] &&
          self[:passwd][self[:deploy][application][:user]][:dir] || "/home/#{self[:deploy][application][:user]}"
 
   default[:deploy][application][:home] = home
-  default[:deploy][application][:stack][:recipe] = "passenger_apache2::rails"
-  default[:deploy][application][:stack][:needs_reload] = true
-  default[:deploy][application][:stack][:service] = 'apache2'
 
   default[:deploy][application][:sleep_before_restart] = 0
-  default[:deploy][application][:restart_command] = "touch tmp/restart.txt"
+  default[:deploy][application][:stack][:needs_reload] = true
   default[:deploy][application][:enable_submodules] = true
   default[:deploy][application][:shallow_clone] = true
+  default[:deploy][application][:delete_cached_copy] = true
   default[:deploy][application][:symlink_before_migrate] = {}
 
   default[:deploy][application][:environment] = {"RAILS_ENV" => deploy[:rails_env],
                                                  "RUBYOPT" => "",
                                                  "RACK_ENV" => deploy[:rails_env],
                                                  "HOME" => home}
   default[:deploy][application][:ssl_support] = false
+  default[:deploy][application][:auto_npm_install_on_deploy] = true
+
+  # nodejs
+  default[:deploy][application][:nodejs][:restart_command] = "monit restart node_web_app_#{application}"
+  default[:deploy][application][:nodejs][:stop_command] = "monit stop node_web_app_#{application}"
 end
 
-default[:logrotate][:rotate] = 30
-default[:logrotate][:dateformat] = false # set to '-%Y%m%d' to have date formatted logs
+default[:scalarium][:skip_uninstall_of_other_rails_stack] = false

deploy/attributes/logrotate.rb

@@ -0,0 +1,2 @@
+default[:logrotate][:rotate] = 30
+default[:logrotate][:dateformat] = false # set to '-%Y%m%d' to have date formatted logs

deploy/attributes/rails_stack.rb

@@ -0,0 +1,15 @@
+default[:scalarium][:rails_stack][:name] = "apache_passenger"
+case node[:scalarium][:rails_stack][:name]
+when "apache_passenger"
+  default[:scalarium][:rails_stack][:recipe] = "passenger_apache2::rails"
+  default[:scalarium][:rails_stack][:needs_reload] = true
+  default[:scalarium][:rails_stack][:service] = 'apache2'
+  default[:scalarium][:rails_stack][:restart_command] = 'touch tmp/restart.txt'
+when "nginx_unicorn"
+  default[:scalarium][:rails_stack][:recipe] = "unicorn::rails"
+  default[:scalarium][:rails_stack][:needs_reload] = true
+  default[:scalarium][:rails_stack][:service] = 'unicorn'
+  default[:scalarium][:rails_stack][:restart_command] = '../../shared/scripts/unicorn clean-restart'
+else
+  raise "Unknown stack: #{node[:scalarium][:rails_stack][:name].inspect}"
+end