runit-man 2.3.8 → 2.3.9

data/CHANGELOG.markdown

@@ -1,5 +1,10 @@
 ## Changes
 
+### Version 2.3.8
+
+* Minor update of handling logger log directories (we should remove last character from log directory name if it's equal to ':').
+* Enabling of using 'bundle exec rake ...' command.
+
 ### Version 2.3.7
 
 * '--rackup' option now takes in care all specified options (earlier it takes in care only preceding options).

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    runit-man (2.3.8)
+    runit-man (2.3.9)
       file-tail (>= 1.0.5)
       haml (>= 3.0)
       i18n (>= 0.5.0)
@@ -12,21 +12,22 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
-    file-tail (1.0.5)
-      spruz (>= 0.1.0)
+    diff-lcs (1.1.3)
+    file-tail (1.0.6)
+      spruz (~> 0.2)
     haml (3.1.2)
     i18n (0.6.0)
-    kgio (2.5.0)
-    rack (1.3.0)
-    rack-test (0.6.0)
+    kgio (2.6.0)
+    rack (1.3.2)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rainbows (3.4.0)
-      kgio (~> 2.4)
+    rainbows (4.3.1)
+      kgio (~> 2.5)
       rack (~> 1.1)
-      unicorn (~> 3.6)
-    rake (0.8.7)
-    rr (1.0.2)
+      unicorn (~> 4.1)
+    raindrops (0.7.0)
+    rake (0.9.2)
+    rr (1.0.4)
     rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
@@ -36,12 +37,13 @@ GEM
       tilt (>= 1.2.2, < 2.0)
     sinatra-content-for2 (0.2.4)
       sinatra
-    spruz (0.2.8)
-    tilt (1.3.2)
-    unicorn (3.7.0)
-      kgio (~> 2.3)
+    spruz (0.2.13)
+    tilt (1.3.3)
+    unicorn (4.1.1)
+      kgio (~> 2.4)
       rack
-    yajl-ruby (0.8.2)
+      raindrops (~> 0.6)
+    yajl-ruby (0.8.3)
 
 PLATFORMS
   ruby

data/README.markdown

@@ -4,6 +4,10 @@ Simple [runit](http://smarden.org/runit/ "runit home page") web management tool
 
 Server will run by **runit-man** script. Take a note that **runit-man** must have privileges like **runsvdir** process ones.
 
+## Screenshot
+
+![Screenshot](https://github.com/Undev/runit-man/raw/master/runit-man-screenshot.gif "Screenshot")
+
 ## Installation
 
 Usually You should install both **runit-man** and **thin** gems to run this tool fine.

data/README_ru.markdown

@@ -4,6 +4,10 @@
 
 Сервер запускается скриптом **runit-man**. Примите во внимание, что  **runit-man** обязан иметь привилегии, аналогичные привилегиям процесса **runsvdir**.
 
+## Скриншот
+
+![Скриншот](https://github.com/Undev/runit-man/raw/master/runit-man-screenshot.gif "Скриншот")
+
 ## Инсталляция
 
 Обычно вам нужно поставить гемы **runit-man** и **thin** совместно, чтобы эта утилита работала эффективно.

data/i18n/en.yml

@@ -17,6 +17,7 @@ en:
         'yes': Does support low CPU usage using sendfile API.
         'no': Doesn''t support low CPU usage using sendfile API.
     services:
+      readonly: Only view enabled.
       table:
         caption: Services
         headers:

data/i18n/ru.yml

@@ -17,6 +17,7 @@ ru:
         'yes': Поддерживает низкое потребление CPU с использованием механизма sendfile.
         'no': Не поддерживает низкое потребление CPU с использованием механизма sendfile.
     services:
+      readonly: Только для просмотра.
       table:
         caption: Сервисы
         headers:

data/lib/runit-man/app.rb

@@ -73,6 +73,11 @@ class RunitMan < Sinatra::Base
 
   helpers do
     include Helpers
+
+    def readonly?
+      @read_write_mode == :readonly
+    end
+
   end
 
   def self.i18n_location
@@ -98,6 +103,7 @@ class RunitMan < Sinatra::Base
   end
 
   before do
+    @read_write_mode = RunitMan.read_write_mode
     @scripts = []
     base_content_type = CONTENT_TYPES.keys.detect do |t|
       request.env['REQUEST_URI'] =~ /\.#{Regexp.escape(t.to_s)}$/
@@ -248,25 +254,36 @@ class RunitMan < Sinatra::Base
 
   def log_action(name, text)
     env  = request.env
-    addr = env.include?('X_REAL_IP') ? env['X_REAL_IP'] : env['REMOTE_ADDR']
-    $stdout.puts "#{addr} - - [#{Time.now}] \"Do #{text} on #{name}\""
-    $stdout.flush
+    log "#{addr} - - [#{Time.now}] \"Do #{text} on #{name}\""
+  end
+
+  def log_denied_action(name, text)
+    env  = request.env
+    log "#{addr} - - [#{Time.now}] \"Receive #{text} for #{name}. Denied.\""
   end
 
   post '/:name/signal/:signal' do |name, signal|
-    service = ServiceInfo[name]
-    return not_found if service.nil?
-    service.send_signal(signal)
-    log_action(name, "send signal \"#{signal}\"")
+    unless readonly?
+      service = ServiceInfo[name]
+      return not_found if service.nil?
+      service.send_signal(signal)
+      log_action(name, "send signal \"#{signal}\"")
+    else
+      log_denied_action(name, "signal \"#{signal}\"")
+    end
     ''
   end
 
   post '/:name/:action' do |name, action|
-    service = ServiceInfo[name]
-    action = "#{action}!".to_sym
-    return not_found if service.nil? || !service.respond_to?(action)
-    service.send(action)
-    log_action(name, action)
+    unless readonly?
+      service = ServiceInfo[name]
+      action = "#{action}!".to_sym
+      return not_found if service.nil? || !service.respond_to?(action)
+      service.send(action)
+      log_action(name, action)
+    else
+      log_denied_action(name, action)
+    end
     ''
   end
 
@@ -277,6 +294,7 @@ class RunitMan < Sinatra::Base
       ENV['RUNIT_LOGGER']              = RunitMan.runit_logger
       ENV['RUNIT_MAN_VIEW_FILES']      = RunitMan.files_to_view.join(',')
       ENV['RUNIT_MAN_CREDENTIALS']     = RunitMan.allowed_users.keys.map { |user| "#{user}:#{RunitMan.allowed_users[user]}" }.join(',')
+      ENV['RUNIT_MAN_READWRITE_MODE']  = RunitMan.read_write_mode.to_s
 
       Dir.chdir(File.dirname(__FILE__))
       exec(command)
@@ -338,6 +356,7 @@ class RunitMan < Sinatra::Base
       logger                    = RunitMan.runit_logger
       auth                      = RunitMan.allowed_users
       rackup_command_line       = RunitMan.rackup_command_line
+      read_write_mode           = RunitMan.read_write_mode.to_s
       File.open(script_name, 'w') do |script_source|
         script_source.print ERB.new(IO.read(template_name)).result(binding())
       end

data/lib/runit-man/config.ru

@@ -4,7 +4,8 @@ require 'runit-man/app'
 
 RunitMan.set :active_services_directory, ENV['RUNIT_ACTIVE_SERVICES_DIR'] || RunitMan::DEFAULT_ACTIVE_SERVICES_DIR
 RunitMan.set :all_services_directory,    ENV['RUNIT_ALL_SERVICES_DIR'] || RunitMan::DEFAULT_ALL_SERVICES_DIR
-RunitMan.set :runit_logger,             ENV['RUNIT_LOGGER'] || RunitMan::DEFAULT_LOGGER
+RunitMan.set :runit_logger,              ENV['RUNIT_LOGGER'] || RunitMan::DEFAULT_LOGGER
+RunitMan.set :read_write_mode,           (ENV['RUNIT_READWRITE_MODE'] || 'rw').to_sym
 
 if ENV['RUNIT_MAN_VIEW_FILES']
   ENV['RUNIT_MAN_VIEW_FILES'].split(/\s*\,\s*/).each do |floc|

data/lib/runit-man/helpers.rb

@@ -12,6 +12,15 @@ module Helpers
 
   attr_accessor :even_or_odd_state
 
+  def addr
+    env.include?('X_REAL_IP') ? env['X_REAL_IP'] : env['REMOTE_ADDR']
+  end
+
+  def log(s)
+    $stdout.puts s
+    $stdout.flush
+  end
+
   def host_name
     Utils.host_name
   end

data/lib/runit-man/runner.rb

@@ -5,6 +5,7 @@ RunitMan.set :active_services_directory, RunitMan::DEFAULT_ACTIVE_SERVICES_DIR
 RunitMan.set :all_services_directory,    RunitMan::DEFAULT_ALL_SERVICES_DIR
 RunitMan.set :runit_logger,              RunitMan::DEFAULT_LOGGER
 RunitMan.set :rackup_command_line,       false
+RunitMan.set :read_write_mode,           :readwrite
 
 OptionParser.new { |op|
   op.banner = 'Usage: runit-man <options>'
@@ -13,6 +14,7 @@ OptionParser.new { |op|
   op.on('-s server') { |val| RunitMan.set :server, val }
   op.on('-p port')   { |val| RunitMan.set :port, val.to_i }
   op.on('-b addr')   { |val| RunitMan.set :bind, val } if RunitMan.respond_to?(:bind)
+  op.on('-m mode (rw by default)')   { |val| RunitMan.set(:read_write_mode, :readonly) if val =~ /^read\-only|readonly|ro$/ }
   op.separator 'runit options:'
   op.on('-a active_services_directory (/etc/service by default)') { |val| RunitMan.set :active_services_directory, val }
   op.on('-f all_services_directory (/etc/sv by default)')         { |val| RunitMan.set :all_services_directory, val }

data/lib/runit-man/version.rb

@@ -1,5 +1,5 @@
 module RunitManVersion
-  VERSION = '2.3.8'.freeze
+  VERSION = '2.3.9'.freeze
 
   class << self
     attr_accessor :sendfile

data/sv/run.erb

@@ -1,4 +1,4 @@
 #!/bin/bash
 exec 2>&1
-exec runit-man<% if server.kind_of?(String) %> -s "<%= server %>"<% end %><% if bind %> -b <%= bind %><% end %> -p <%= port %> -a "<%= active_services_directory %>" -f "<%= all_services_directory %>"<% files_to_view.each do |f| %> -v "<%= f %>"<% end %><% auth.each_pair do |name, password| %> -u <%= name %>:<%= password %><% end %><%= logger ? " -l \"#{logger}\"" : '' %><% if rackup_command_line %> --rackup '<%= rackup_command_line %>'<% end %>
+exec runit-man -m <%= read_write_mode.to_s %><% if server.kind_of?(String) %> -s "<%= server %>"<% end %><% if bind %> -b <%= bind %><% end %> -p <%= port %> -a "<%= active_services_directory %>" -f "<%= all_services_directory %>"<% files_to_view.each do |f| %> -v "<%= f %>"<% end %><% auth.each_pair do |name, password| %> -u <%= name %>:<%= password %><% end %><%= logger ? " -l \"#{logger}\"" : '' %><% if rackup_command_line %> --rackup '<%= rackup_command_line %>'<% end %>
 

data/views/_service_info.haml

@@ -6,18 +6,21 @@
   %td= service_info.uptime ? ('%.2f' % service_info.uptime) : ''
   %td= stat_subst(service_info.stat)
   %td
-    - if service_info.active?
-      = service_action service_info.name, :restart, t('runit.services.table.actions.restart'), !service_info.down?
-      = service_action service_info.name, :down, t('runit.services.table.actions.stop'), !service_info.down?
-      = service_action service_info.name, :up, t('runit.services.table.actions.start'), service_info.down?
-      - unless service_info.down?
-        - service_info.allowed_signals.each do |signal|
-          = service_signal service_info.name, signal, t("runit.services.table.signals.#{signal}")
-      - if service_info.switchable?
-        = service_action service_info.name, :switch_down, t('runit.services.table.actions.switch_down')
+    - if readonly?
+      %strong= t('runit.services.readonly')
     - else
-      - if service_info.switchable?
-        = service_action service_info.name, :switch_up, t('runit.services.table.actions.switch_up')
+      - if service_info.active?
+        = service_action service_info.name, :restart, t('runit.services.table.actions.restart'), !service_info.down?
+        = service_action service_info.name, :down, t('runit.services.table.actions.stop'), !service_info.down?
+        = service_action service_info.name, :up, t('runit.services.table.actions.start'), service_info.down?
+        - unless service_info.down?
+          - service_info.allowed_signals.each do |signal|
+            = service_signal service_info.name, signal, t("runit.services.table.signals.#{signal}")
+        - if service_info.switchable?
+          = service_action service_info.name, :switch_down, t('runit.services.table.actions.switch_down')
+      - else
+        - if service_info.switchable?
+          = service_action service_info.name, :switch_up, t('runit.services.table.actions.switch_up')
   %td
     - if service_info.logged?
       = log_link(service_info.name, :hint => t('runit.services.table.values.log_hint', :name => service_info.name), :blank => true, :title => service_info.log_file_location)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 2
   - 3
-  - 8
-  version: 2.3.8
+  - 9
+  version: 2.3.9
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 +04:00
+date: 2011-09-05 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +32,11 @@ dependencies:
         - 7
         - 8
         version: 0.7.8
-  name: yajl-ruby
   type: :runtime
-  prerelease: false
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +47,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  name: haml
   type: :runtime
-  prerelease: false
   requirement: *id002
 - !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,11 +62,11 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  name: sinatra
   type: :runtime
-  prerelease: false
   requirement: *id003
 - !ruby/object:Gem::Dependency 
+  name: sinatra-content-for2
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,11 +78,11 @@ dependencies:
         - 2
         - 4
         version: 0.2.4
-  name: sinatra-content-for2
   type: :runtime
-  prerelease: false
   requirement: *id004
 - !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,11 +94,11 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
-  name: i18n
   type: :runtime
-  prerelease: false
   requirement: *id005
 - !ruby/object:Gem::Dependency 
+  name: file-tail
+  prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -108,11 +110,11 @@ dependencies:
         - 0
         - 5
         version: 1.0.5
-  name: file-tail
   type: :runtime
-  prerelease: false
   requirement: *id006
 - !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -124,11 +126,11 @@ dependencies:
         - 9
         - 0
         version: 0.9.0
-  name: rake
   type: :development
-  prerelease: false
   requirement: *id007
 - !ruby/object:Gem::Dependency 
+  name: rspec-core
+  prerelease: false
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -138,11 +140,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rspec-core
   type: :development
-  prerelease: false
   requirement: *id008
 - !ruby/object:Gem::Dependency 
+  name: rspec-expectations
+  prerelease: false
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -152,11 +154,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rspec-expectations
   type: :development
-  prerelease: false
   requirement: *id009
 - !ruby/object:Gem::Dependency 
+  name: rr
+  prerelease: false
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -166,11 +168,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rr
   type: :development
-  prerelease: false
   requirement: *id010
 - !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -180,11 +182,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rack-test
   type: :development
-  prerelease: false
   requirement: *id011
 - !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -196,9 +198,7 @@ dependencies:
         - 0
         - 10
         version: 1.0.10
-  name: bundler
   type: :development
-  prerelease: false
   requirement: *id012
 description: |
   Simple runit (http://smarden.org/runit/) web management tool with i18n.
@@ -248,6 +248,7 @@ files:
 - public/favicon.ico
 - public/js/jquery-1.6.1.min.js
 - public/js/runit-man.js
+- runit-man-screenshot.gif
 - runit-man.gemspec
 - script/console
 - spec/functional/runit-man_spec.rb