le1t0-deprec 2.1.6.029 → 2.1.6.030

data/CHANGELOG

@@ -1,5 +1,10 @@
 # deprec changelog
 
+= 2.1.6.030 (Jul 20, 2010)
+
+* small fix to db create/seed during migrations (only when running cold migrations)
+* add syslog alternatives
+
 = 2.1.6.029 (Jul 19, 2010)
 
 * add extra database tasks to rails recipe

data/lib/deprec/recipes/rails.rb

@@ -35,10 +35,12 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
   
   before 'deploy:migrate' do
-    unless ENV['DO_SEED']
-      top.deprec.rails.database.create
-    else
-      top.deprec.rails.database.seed
+    if exists?(:running_cold_deploy) && running_cold_deploy
+      unless ENV['DO_SEED']
+        top.deprec.rails.database.create
+      else
+        top.deprec.rails.database.seed
+      end
     end
   end
 

data/lib/deprec/recipes/syslog/syslog_ng.rb

@@ -0,0 +1,156 @@
+# Copyright 2010 by le1t0@github. All rights reserved.
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :deprec do 
+    namespace :syslog_ng do
+      
+      set :syslog_ng_server, nil
+      set :syslog_ng_server_port, 5140
+      set :syslog_ng_is_server, false # set this option to true if the server(s) mentioned in your recipe are syslog servers
+      set :syslog_ng_server_max_connections, 100
+      
+      set :syslog_ng_options, {
+        :chain_hostnames => 0,
+        :time_reopen => 10,
+        :time_reap => 360,
+        #:sync => 0,
+        :log_fifo_size => 2048,
+        :create_dirs => :yes,
+        #:owner => :root, 
+        :group => :adm,
+        :perm => :"0640",
+        #:dir_owner => :root,
+        #:dir_group => :root,
+        :dir_perm => :"0755",
+        :use_dns => :no,
+        #:log_msg_size => 2048,
+      	:stats_freq => 0,
+      	:bad_hostname => :"^gconfd$",
+      }
+      set :syslog_ng_logs, {
+        :s_all => {
+          :df_auth => :f_auth,
+          :df_syslog => :f_syslog,
+          :df_cron => :f_cron,
+          :df_daemon => :f_daemon,
+          :df_kern => :f_kern,
+          :df_lpr => :f_lpr,
+          :df_mail => :f_mail,
+          :df_user => :f_user,
+          :df_uucp => :f_uucp,
+          :df_facility_dot_info => [ :f_mail, :f_at_least_info ],
+          :df_facility_dot_warn => [ :f_mail, :f_at_least_warn ],
+          :df_facility_dot_err => [ :f_mail, :f_at_least_err ],
+          :df_news_dot_crit => [ :f_news, :f_at_least_crit ],
+          :df_news_dot_err => [ :f_news, :f_at_least_err ],
+          :df_news_dot_notice => [ :f_news, :f_at_least_notice ],
+          :df_debug => :f_debug,
+          :df_messages => :f_messages,
+          :du_all => :f_emerg,
+          :dp_xconsole => :f_xconsole
+        }
+      }
+      set :syslog_ng_sources, {
+        :s_all => [
+          "internal()",
+          "unix-stream(/dev/log)",
+          "file(\"/proc/kmsg\" log_prefix(\"kernel: \"))"
+        ]
+      }
+      set :syslog_ng_filters, {
+        :f_auth => "facility(auth, authpriv)",
+        :f_syslog => "not facility(auth, authpriv)",
+        :f_cron => "facility(cron)",
+        :f_daemon => "facility(daemon)",
+        :f_kern => "facility(kern)",
+        :f_lpr => "facility(lpr)",
+        :f_mail => "facility(mail)",
+        :f_news => "facility(news)",
+        :f_user => "facility(user)",
+        :f_uucp => "facility(uucp)",
+        :f_at_least_info => "level(info..emerg)",
+        :f_at_least_notice => "level(notice..emerg)",
+        :f_at_least_warn => "level(warn..emerg)",
+        :f_at_least_err => "level(err..emerg)",
+        :f_at_least_crit => "level(crit..emerg)",
+        :f_debug => "level(debug) and not facility(auth, authpriv, news, mail)",
+        :f_messages => "level(info,notice,warn) and not facility(auth,authpriv,cron,daemon,mail,news)",
+        :f_emerg => "level(emerg)",
+        :f_xconsole => "facility(daemon,mail) or level(debug,info,notice,warn) or (facility(news) and level(crit,err,notice))",
+        :f_daemons => "program(\"(rails|apache|postfix|haproxy|mysql|keepalived|sphinx|firewall)-.*\")"
+      }
+      set :syslog_ng_destinations, {
+        :df_auth => "file(\"/var/log/auth.log\")",
+        :df_syslog => "file(\"/var/log/syslog\")",
+        :df_cron => "file(\"/var/log/cron.log\")",
+        :df_daemon => "file(\"/var/log/daemon.log\")",
+        :df_kern => "file(\"/var/log/kern.log\")",
+        :df_lpr => "file(\"/var/log/lpr.log\")",
+        :df_mail => "file(\"/var/log/mail.log\")",
+        :df_user => "file(\"/var/log/user.log\")",
+        :df_uucp => "file(\"/var/log/uucp.log\")",
+        :df_facility_dot_info => "file(\"/var/log/$FACILITY.info\")",
+        :df_facility_dot_notice => "file(\"/var/log/$FACILITY.notice\")",
+        :df_facility_dot_warn => "file(\"/var/log/$FACILITY.warn\")",
+        :df_facility_dot_err => "file(\"/var/log/$FACILITY.err\")",
+        :df_facility_dot_crit => "file(\"/var/log/$FACILITY.crit\")",
+        :df_news_dot_notice => "file(\"/var/log/news/news.notice\" owner(\"news\"))",
+        :df_news_dot_err => "file(\"/var/log/news/news.err\" owner(\"news\"))",
+        :df_news_dot_crit => "file(\"/var/log/news/news.crit\" owner(\"news\"))",
+        :df_debug => "file(\"/var/log/debug\")",
+        :df_messages => "file(\"/var/log/messages\")",
+        :dp_xconsole => "pipe(\"/dev/xconsole\")",
+        :du_all => "usertty(\"*\")",
+        :df_daemons => "file(\"/var/log/daemons/$PROGRAM/$YEAR$MONTH/$DAY/$PROGRAM-$YEAR$MONTH$DAY\")"
+      }
+      
+      desc "Install syslog-ng"
+      task :install do
+        install_deps
+      end
+
+      # install dependencies for syslog-ng
+      task :install_deps do
+        apt.install( {:base => %w(syslog-ng)}, :stable )
+      end
+      
+      SYSTEM_CONFIG_FILES[:syslog_ng] =  [
+        
+       { :template => 'syslog-ng.conf.erb',
+         :path => '/etc/syslog-ng/syslog-ng.conf',
+         :mode => 0644,
+         :owner => 'root:root'}
+         
+      ]
+           
+      desc "Generate Syslog-ng configs"
+      task :config_gen do
+        SYSTEM_CONFIG_FILES[:syslog_ng].each do |file|
+         deprec2.render_template(:syslog_ng, file)
+        end
+      end
+
+      desc "Push Syslog-ng config files to server"
+      task :config, :roles => :all_hosts do
+        deprec2.push_configs(:syslog_ng, SYSTEM_CONFIG_FILES[:syslog_ng])
+        restart
+      end
+
+      desc "Start Syslog-ng"
+      task :start, :roles => :all_hosts do
+        run "#{sudo} /etc/init.d/syslog-ng start"
+      end
+      
+      desc "Stop Syslog-ng"
+      task :stop, :roles => :all_hosts do
+        run "#{sudo} /etc/init.d/syslog-ng stop"
+      end
+      
+      desc "Restart Syslog-ng"
+      task :restart, :roles => :all_hosts do
+        run "#{sudo} /etc/init.d/syslog-ng restart"
+      end
+
+    end 
+    
+  end
+end

data/lib/deprec/templates/syslog_ng/syslog-ng.conf.erb

@@ -0,0 +1,58 @@
+options {<% syslog_ng_options.reverse_merge(syslog_ng_is_server ? {
+	:keep_hostname => :yes
+} : {}).each do |key, value| %>
+		<%= value.nil? ? "" : "#{key}(#{value.is_a?(String) ? "\"#{value}\"" : value.to_s});" %>
+<% end %>};
+
+<% syslog_ng_sources.reverse_merge(syslog_ng_is_server ? {
+	:s_net => "tcp(ip(#{syslog_ng_server}) port(#{syslog_ng_server_port || 5140}) max-connections(#{syslog_ng_server_max_connections || 10}));"
+} : {}).each do |name, syslog_ng_source_list| %>
+source <%= name %> {
+	<% [syslog_ng_source_list].flatten.each do |syslog_ng_source| %>
+		<%= syslog_ng_source.gsub(/;$/, '') %>;
+	<% end %>
+};
+<% end %>
+
+<% syslog_ng_filters.each do |name, syslog_ng_filter_list| %>
+filter <%= name %> {
+	<% [syslog_ng_filter_list].flatten.each do |syslog_ng_filter| %>
+		<%= syslog_ng_filter.gsub(/;$/, '') %>;
+	<% end %>
+};
+<% end %>
+
+<% syslog_ng_destinations.reverse_merge(syslog_ng_server.nil? || syslog_ng_is_server ? {} : { :d_log_server => "tcp(\"#{syslog_ng_server}\" port(#{syslog_ng_server_port || 5140}));" }).each do |name, syslog_ng_destination_list| %>
+destination <%= name %> {
+	<% [syslog_ng_destination_list].flatten.each do |syslog_ng_destination| %>
+		<%= syslog_ng_destination.gsub(/;$/, '') %>;
+	<% end %>
+};
+<% end %>
+
+<% syslog_ng_logs.reverse_merge(syslog_ng_is_server ? {
+	:s_net => {
+		:df_daemons => {
+			:filters => :f_daemons,
+			:flags => :final
+		}
+	}
+} : {}).each do |source_name, destinations_filters|
+	if source_name == :s_all && syslog_ng_server
+		destinations_filters.reverse_merge!(
+			[ :df_daemons, :d_log_server ] => { :filters => :f_daemons, :flags => :final})
+	end
+   	destinations_filters.each do |destinations, filters| %>
+log {
+		source(<%= source_name %>);
+		<% [filters.is_a?(Hash) ? filters[:filters] : filters].flatten.each do |syslog_filter| %>
+		filter(<%= syslog_filter %>);
+		<% end %>
+		<% [destinations].flatten.each do |destination| %>
+		destination(<%= destination %>);
+		<% end %>
+		<% [filters.is_a?(Hash) ? filters[:flags] : []].flatten.each do |flag| %>
+		flags(<%= flag %>);
+		<% end %>
+};
+<% end %>

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 1
   - 6
-  - 29
-  version: 2.1.6.029
+  - 30
+  version: 2.1.6.030
 platform: ruby
 authors: 
 - Le1t0
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 +02:00
+date: 2010-07-20 00:00:00 +02:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,7 +113,8 @@ files:
 - lib/deprec/recipes/ssl.rb
 - lib/deprec/recipes/starling.rb
 - lib/deprec/recipes/svn.rb
-- lib/deprec/recipes/syslog.rb
+- lib/deprec/recipes/syslog/syslog.rb
+- lib/deprec/recipes/syslog/syslog_ng.rb
 - lib/deprec/recipes/trac.rb.disabled
 - lib/deprec/recipes/tsung.rb.unmaintained
 - lib/deprec/recipes/ubuntu.rb
@@ -235,6 +236,7 @@ files:
 - lib/deprec/templates/subversion/svn.apache.vhost.erb
 - lib/deprec/templates/syslog/syslog.conf.erb
 - lib/deprec/templates/syslog/syslogd.erb
+- lib/deprec/templates/syslog_ng/syslog-ng.conf.erb
 - lib/deprec/templates/trac/apache_vhost.conf.erb
 - lib/deprec/templates/trac/nginx_vhost.conf.erb
 - lib/deprec/templates/trac/trac.ini.erb