change keep server to sinatra modular style

diff --git a/services/keep/INSTALL b/services/keep/INSTALL
index e30b29ad62e0ab98e692a8529d49fd5a66476e83..6280cd94759987b327d10e6094d1af520e2bf90a 100644 (file)
--- a/services/keep/INSTALL
+++ b/services/keep/INSTALL
@@ -1,6 +1,20 @@
-rvm use 1.9.3
-gem install sinatra
-gem install getopt
+Install dependencies
 
-mkdir -p /some-mount-point/keep
-./keepd
+ rvm use 1.9.3
+ gem install sinatra
+ gem install thin
+
+Set up Keep backing store directories
+
+ mount /dev/some-disk /mnt/point
+ mkdir -p /mnt/point/keep
+
+Start server
+
+ IP=0.0.0.0 PORT=25107 ./keep.rb
+
+Start server With SSL support
+
+ export SSL_CERT=/etc/ssl/certs/keep.crt
+ export SSL_KEY=/etc/ssl/private/keep.pem
+ IP=... PORT=... ./keep.rb

diff --git a/services/keep/keep.rb b/services/keep/keep.rb
new file mode 100755 (executable)
index 0000000..26c31c6
--- /dev/null
+++ b/services/keep/keep.rb
@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+
+require 'sinatra/base'
+
+class Keep < Sinatra::Base
+  configure do
+    mime_type :binary, 'application/octet-stream'
+    enable :logging
+    set :port, (ENV['PORT'] || '25107').to_i
+    set :bind, (ENV['IP'] || '0.0.0.0')
+  end
+
+  def self.debuglevel
+    if ENV['DEBUG'] and ENV['DEBUG'].match /^-?\d+/
+      ENV['DEBUG'].to_i
+    else
+      0
+    end
+  end
+
+  def self.debuglog(loglevel, msg)
+    if debuglevel >= loglevel
+      $stderr.puts "[keepd/#{$$} #{Time.now}] #{msg}"
+    end
+  end
+  def debuglog(*args)
+    self.class.debuglog *args
+  end
+
+  def keepdirs
+    @@keepdirs
+  end
+
+  def self.keepdirs
+    return @@keepdirs if defined? @@keepdirs
+    # Configure backing store directories
+    keepdirs = []
+    rootdir = (ENV['KEEP_ROOT'] || '/').sub /\/$/, ''
+    `mount`.split("\n").each do |mountline|
+      dev, on_txt, mountpoint, type_txt, fstype, opts = mountline.split
+      if on_txt == 'on' and type_txt == 'type'
+        debuglog 2, "dir #{mountpoint} is mounted"
+        if mountpoint[0..(rootdir.length)] == rootdir + '/'
+          debuglog 2, "dir #{mountpoint} is in #{rootdir}/"
+          keepdir = "#{mountpoint.sub /\/$/, ''}/keep"
+          if File.exists? "#{keepdir}/."
+            keepdirs << { :root => "#{keepdir}", :readonly => false }
+            if opts.gsub(/[\(\)]/, '').split(',').index('ro')
+              keepdirs[-1][:readonly] = true
+            end
+            debuglog 0, "keepdir #{keepdirs[-1].inspect}"
+          end
+        end
+      end
+    end
+    @@keepdirs = keepdirs
+  end
+  self.keepdirs
+
+  get '/:locator' do |locator|
+    regs = locator.match /^([0-9a-f]{32,})/
+    if regs
+      hash = regs[1]
+      subdir = hash[0..2]
+      found = false
+      keepdirs.each do |keepdir|
+        backfile = "#{keepdir[:root]}/#{subdir}/#{hash}"
+        if File.exists? backfile
+          data = nil
+          File.open("#{keepdir[:root]}/lock", "a+") do |f|
+            if f.flock File::LOCK_EX
+              data = File.read backfile
+            end
+          end
+          if data
+            found = true
+            content_type :binary
+            body data
+            break
+          end
+        end
+      end
+      if not found
+        status 404
+        body 'not found'
+      end
+    else
+      pass
+    end
+  end
+
+  if app_file == $0
+    run! do |server|
+      if ENV['SSL_CERT'] and ENV['SSL_KEY']
+        ssl_options = {
+          :cert_chain_file => ENV['SSL_CERT'],
+          :private_key_file => ENV['SSL_KEY'],
+          :verify_peer => false
+        }
+        server.ssl = true
+        server.ssl_options = ssl_options
+      end
+    end
+  end
+end

diff --git a/services/keep/keepd b/services/keep/keepd
deleted file mode 100755 (executable)
index b006afb..0000000
--- a/services/keep/keepd
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'getopt/long'
-include Getopt
-$opt = Long.getopts(
-                   ["--debug", "-d", BOOLEAN],
-                   ["--port", "-p", OPTIONAL],
-                   ["--root-dir", "-r", OPTIONAL]
-                   )
-default_opt = {
-  'port' => 25107,
-  'root-dir' => '/'
-}
-$opt = default_opt.merge $opt
-
-ARGV.reject! { |x| true }    # prevent sinatra from trying to parse it
-require 'sinatra'
-
-# Configure sinatra server
-set :port, $opt['port'].to_i
-configure do
-  mime_type :binary, 'application/octet-stream'
-end
-
-def debuglog(loglevel, msg)
-  if $opt['debug'] or loglevel < 2
-    $stderr.puts "[keepd/#{$$} #{Time.now}] #{msg}"
-  end
-end
-
-# Configure backing store directories
-keepdirs = []
-rootdir = $opt['root-dir'].sub(/\/+$/, '')
-`mount`.split("\n").each do |mountline|
-  dev, on_txt, mountpoint, type_txt, fstype, opts = mountline.split
-  if on_txt == 'on' and type_txt == 'type'
-    debuglog 2, "dir #{mountpoint} is mounted"
-    if mountpoint[0..(rootdir.length)] == rootdir + '/'
-      debuglog 2, "dir #{mountpoint} is in #{rootdir}"
-      keepdir = "#{mountpoint.sub /\/$/, ''}/keep"
-      if File.exists? "#{keepdir}/."
-        keepdirs << { :root => "#{keepdir}", :readonly => false }
-        if opts.gsub(/[\(\)]/, '').split(',').index('ro')
-          keepdirs[-1][:readonly] = true
-        end
-        debuglog 1, "keepdir #{keepdirs[-1].inspect}"
-      end
-    end
-  end
-end
-
-get '/:locator' do |locator|
-  regs = locator.match /^([0-9a-f]{32,})/
-  if regs
-    hash = regs[1]
-    subdir = hash[0..2]
-    found = false
-    keepdirs.each do |keepdir|
-      backfile = "#{keepdir[:root]}/#{subdir}/#{hash}"
-      if File.exists? backfile
-        data = nil
-        File.open("#{keepdir[:root]}/lock", "a+") do |f|
-          if f.flock File::LOCK_EX
-            data = File.read backfile
-          end
-        end
-        if data
-          found = true
-          content_type :binary
-          body data
-          break
-        end
-      end
-    end
-    if not found
-      status 404
-      body 'not found'
-    end
-  else
-    pass
-  end
-end