capistrano-devops 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 796e319fadbfaf5d6b53b0b221bb027669c71a5c
-  data.tar.gz: 1209a1ac9b6f6b7cc40c0eaa5191da3271d835b2
+  metadata.gz: bb762a5df31afd7dbbb7dfd068b99a22df9bc89e
+  data.tar.gz: 73aa1d0a9f46a26d81912acd1a5977a33b6ceee6
 SHA512:
-  metadata.gz: 35c3f0ff34f8407f98df56bece0b2654aae5fcd308469ef152cc91ac49a0b41822ac1182481197fd14fdbaffb054a28cc7b36f24a3ce3f55d00dcc42e4d2ad86
-  data.tar.gz: 496b4363a88a8c298f53377890512828fef20137c337eb603d01ff7337d540ebf8c5d448d0fd369b582205ddd1e4fd5262f281c12e829d724e8b2b159d065432
+  metadata.gz: d0a0f0bd27a41e04c080ee3ef0425127c5f366870d7ce9568742beacf34d754dd98269b88af24056afdff3aa4db4bffce6747102ded316f6e084e659f554742f
+  data.tar.gz: 75bcd6ef3704415f47ddbce0f9644fa0b48d1dcfac2274ac794dbf21f12c4f14f46483fa9ab30369894d422f7ac11f55c7bb9c3115e41787b5f391b8bbd94cf2

data/README.md

@@ -18,7 +18,13 @@ Or install it yourself as:
 
 ## Usage
 
-    require 'capistrano/devops' in Capfile
+add in Capfile
+
+    require 'capistrano/devops'
+
+add in deploy.rb
+
+    set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
 
 ## Contributing
 

data/lib/capistrano/devops/templates/rainbows_init.erb

@@ -14,7 +14,7 @@ set -e
 TIMEOUT=${TIMEOUT-60}
 APP_ROOT=<%= current_path %>
 PID=<%= fetch(:rainbows_pid) %>
-CMD="cd <%= current_path %>; bundle exec rainbows -D -c <%= fetch(:rainbows_config) %> -E <%= fetch(:rails_env) %>"
+CMD="cd <%= current_path %>; bundle exec rainbows -D -c <%= fetch(:rainbows_config) %> -E <%= fetch(:rails_env, 'production') %>"
 AS_USER=<%= fetch(:rainbows_user) %>
 set -u
 

data/lib/capistrano/devops/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Devops
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/capistrano/tasks/papertrail.rake

@@ -3,48 +3,76 @@ load File.expand_path("../set_rails_env.rake", __FILE__)
 namespace :papertrail do
   # desc 'Adds papertrail to rsyslog as an output channel'
   task :add_to_rsyslog do
-    # as root add
-    # *.*          @logs.papertrailapp.com:31378
-    # to the end of /etc/rsyslog.conf
-
-    # restart rsyslog
-    # sudo /etc/init.d/rsyslog restart
+    on roles(:all) do
+      as :root do
+        within '/etc' do
+          # TODO: this is awfully familiar to the ssh block, need to DRY up
+          file = capture(:cat, 'rsyslog.conf')
+          lines = file.split("\n")
+          lines << "*.* @#{fetch(:papertrail_host, 'logs.papertrailapp.com')}:#{fetch(:papertrail_port, 1234)}" + "\n"
+          new_file = StringIO.new(lines.join("\n"))
+          upload! new_file, '/tmp/rsyslog.conf'
+          execute :mv, '/tmp/rsyslog.conf', 'rsyslog.conf'
+          execute :service, 'rsyslog restart'
+        end
+      end
+    end
   end
 
-  # desc 'Install remote_syslog'
+  # desc 'Install remote_syslog on all app servers'
   task :remote_syslog do
-    # sudo gem install remote_syslog
-    # Paths to log file(s) can be specified on the command-line, or save log_files.yml.example (typically as /etc/log_files.yml). Edit it to define:
-    #   - path to this app's log file, and any other log file(s) to watch.
-    #   - destination host and port (provided by Papertrail). You can find the settings by clicking Add System from the dashboard.
-
-    # /etc/log_files.yml
-    # files:
-    #   - /var/log/httpd/access_log
-    #   - /var/log/httpd/error_log
-    #   - /opt/misc/*.log
-    #   - /var/log/mysqld.log
-    #   - /var/run/mysqld/mysqld-slow.log
-    # destination:
-    #   host: logs.papertrailapp.com
-    #   port: 12345   # NOTE: change to your Papertrail port
-
-    # While remote_syslog does not need to run as root, it does need permission to write its PID file (by default to /var/run/remote_syslog.pid) and read permission on the log files it is monitoring.
-
-    # remote_syslog.upstart.conf
-    # description "Monitor files and send to remote syslog"
-    # start on runlevel [2345]
-    # stop on runlevel [!2345]
-
-    # respawn
-
-    # pre-start exec /usr/bin/test -e /etc/log_files.yml
-
-    # exec /var/lib/gems/1.8/bin/remote_syslog -D --tls
+    on roles(:app) do
+      as :root do
+        execute :gem, 'install remote_syslog'
+
+        LOG_FILES_YML = <<-EOF
+files:
+  - #{shared_path.join('log').to_s}/*
+destination:
+  host: #{fetch(:papertrail_host, 'logs.papertrailapp.com')}
+  port: #{fetch(:papertrail_port, 1234)}
+prepend: #{fetch(:application)}
+        EOF
+
+        within '/etc' do
+          # again, DRY this up (because as() doesn't work with upload! or within yet)
+          upload! StringIO.new(LOG_FILES_YML), '/tmp/log_files.yml'
+          execute :mv, '/tmp/log_files.yml', 'log_files.yml'
+        end
+
+        within '/etc/init' do
+
+          UPSTART_CONF = <<-EOF
+description "Monitor files and send to remote syslog"
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+pre-start exec /usr/bin/test -e /etc/log_files.yml
+
+exec /usr/local/bin/remote_syslog -D --tls
+          EOF
+
+# TODO: find out where the remote_syslog is (or if it even got installed)
+# find / -name remote_syslog
+
+          # again, DRY this up (because as() doesn't work with upload! or within yet)
+          upload! StringIO.new(UPSTART_CONF), '/tmp/remote_syslog.conf'
+          execute :mv, '/tmp/remote_syslog.conf', 'remote_syslog.conf'
+
+        end
+
+        execute :service, 'remote_syslog start'
+
+      end
+    end
   end
 
   desc 'Installs papertrail and adds remote_syslog'
   task :install do
+    invoke 'papertrail:add_to_rsyslog'
+    invoke 'papertrail:remote_syslog'
   end
 
 end

data/lib/capistrano/tasks/ssh.rake

@@ -1,3 +1,5 @@
+load File.expand_path("../set_rails_env.rake", __FILE__)
+
 namespace :ssh do
   desc 'Adds public key to the authorized_keys file (to enable passwordless login)'
   task :add_key do

data/sample_app/Gemfile

@@ -37,6 +37,7 @@ end
 
 # Use unicorn as the app server
 gem 'rainbows'
+gem 'eventmachine'
 
 group :development do
   # Use Capistrano for deployment

data/sample_app/Gemfile.lock

@@ -22,7 +22,7 @@ GIT
 
 GIT
   remote: git://github.com/parasquid/capistrano-devops.git
-  revision: d84c855cda8545d39fa529ff454384c6734579a1
+  revision: cef01cf1a586a3584454ecdea62d4d45d4cf117e
   specs:
     capistrano-devops (0.0.1)
       capistrano (~> 3)
@@ -70,6 +70,7 @@ GEM
       execjs
     coffee-script-source (1.6.3)
     erubis (2.7.0)
+    eventmachine (1.0.3)
     execjs (2.0.2)
     hike (1.2.3)
     i18n (0.6.5)
@@ -172,6 +173,7 @@ DEPENDENCIES
   capistrano-rails
   capistrano-rbenv!
   coffee-rails (~> 4.0.0)
+  eventmachine
   jbuilder (~> 1.2)
   jquery-rails
   multi_json!

data/sample_app/config/deploy.rb

@@ -18,7 +18,7 @@ set :log_level, :debug
 # set :pty, true
 
 # set :linked_files, %w{config/database.yml}
-# set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
+set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
 
 # set :default_env, { path: "/opt/ruby/bin:$PATH" }
 set :keep_releases, 5
@@ -55,6 +55,8 @@ namespace :deploy do
 
   end
 
-  after "deploy:updating", "deploy:checkout_subdir"
+  before "deploy:symlink:shared", "deploy:checkout_subdir"
 
 end
+
+set :papertrail_port, 31378

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-devops
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - tristan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano