proxes 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5c247703a4d859125efdd51491b63191c0843f5
-  data.tar.gz: 5a1d36dced8609f6367f545a25f5f13a7ef72897
+  metadata.gz: 32dfc0bf135b58396f6425bab73d3c93712c8e1b
+  data.tar.gz: 65e8bc0358e0fb03d07d366504f462f127e4c541
 SHA512:
-  metadata.gz: 7c0b0f03f37285547e99c7560d21ee0df1bdb3bd43dd2000633820d6d8e423bded97979705bcd4f5e6ee78d6e6c7f3aefeae62a1a5bacec08e1a0604d8666260
-  data.tar.gz: ca62df0d37592701df2e2185d8bf4f9450dfc0a12d91c936488ca8a3a3d55d9f30ca6bff6b7f2e124a54cafbf305f50f8fc48d52762fc23a048a97ca3ada6f06
+  metadata.gz: b042e47673ab0b50987e9485f8263eeabc3c0989661dab8ea0ea096f9927e1765d6b393c028a0227152ad9f3c4473a07727b7f286e13aee9f7a5b20bcdc9769d
+  data.tar.gz: 94950e321514ba200c45ba65da960b8c2f1d31a2ec45ce199d3a3188efde2f03a90c67d1b026fcb73e810b99d0df641c7b8ef5f1a60aa8b63d460cfc5c2eaab8

data/.gitignore

@@ -15,3 +15,4 @@
 /Gemfile.dev.lock
 proxes-*.gem
 migrations
+.env

data/.travis.yml

@@ -1,20 +1,28 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
+- 2.4.0
+- 2.3.3
+- 2.2.6
 gemfile: Gemfile.ci
 env:
-  - DATABASE_URL="sqlite::memory:" ELASTICSEARCH_URL="http://localhost:9200" RACK_ENV=test
+- DATABASE_URL="sqlite::memory:" ELASTICSEARCH_URL="http://localhost:9200" RACK_ENV=test
 services:
-  - elasticsearch
+- elasticsearch
 before_script:
-  - sleep 10
-  - bundle exec rake ditty:prep
+- sleep 10
+- bundle exec rake ditty:prep
 before_install: gem install bundler -v 1.12.5
 addons:
   code_climate:
     repo_token: 1f562305f75e169f5f5eca3b738fee879550c98e50099c2b9cd6ae71478007a0
+deploy:
+  provider: rubygems
+  api_key:
+    secure: WDO/FSVmUxyz8U6LJyoEEA/Gorw90VbQ8Q4rAu9+L6Lru/PftaVUlcW3ZMATjASHcVX/1KjVJlZNilgMYrV0eayudkeNjWglBozw5FxnhJntgzZAH2Fo/aepF9NHSU29A4SGtl1W0kj8zez9prYn+qcdX/8ei9YMfnP8KkQCKEUeO3/jScHqSZlYZIFI7Ft+QQbJeUTlKc1sJRC5XHG9Oz4lFfSZY0XgZMd5IJsBmwNCGisqgKxBuDEG/9KWwhqops6K6XGPvuhxd8+DFFrDSrI3HR1NsP9RrQxwFc9TnIc+Rzu/FjSF44NJgaiFKKPdZ116w5ChnpY0B59tzOyh/aCwvAl2w7usIqNkhXey0eJ/MZm4S+7l1AoVlxYVujBBl/tRt8PeqlRqjJWAnr1mu/p74cS/jyXhZbHJpNvmv5M7YJzzFIYI12el4Wm05fPo2L605g0c7+pFCW3F+HPAp5qItrjlNx3HoMNNoGDQO+057g3OeVjOivV5Vxjp9IYwZmNCD35IaLFXk+umYD4Jw047rUSGoboc0i/5k6ZYHSBrvIivvRCZNAXSbGi1nLR/lv42Chu2wRCWzMjyPgQQ4I0xGlVwu8kfIQsvPVAM3szNczl9xY8S311eBJforo5prPr6wLaEile0KLmMOai+1n0sr+exy056Z7ttBjwIwoQ=
+  gem: proxes
+  on:
+    tags: true
+    repo: EagerELK/proxes
 after_success:
-  - bundle exec codeclimate-test-reporter
+- bundle exec codeclimate-test-reporter

data/Dockerfile

@@ -0,0 +1,43 @@
+FROM ruby:2.4-alpine
+MAINTAINER Jurgens du Toit <jurgens@datatools.io>
+
+EXPOSE 9292
+# Add your certificates to the project and uncomment the following lines to enable SSL
+# COPY privkey.pem /usr/src/app
+# COPY fullchain.pem /usr/src/app
+# EXPOSE 9293
+
+WORKDIR /usr/src/app
+RUN apk add --update \
+  build-base \
+  libxml2-dev \
+  libxslt-dev \
+  openssh \
+  openssl \
+  openssl-dev \
+  postgresql-dev \
+  && rm -rf /var/cache/apk/* \
+  && mkdir /root/.ssh \
+  && mkdir /usr/src/app/tmp \
+  && mkdir /usr/src/app/logs \
+  && mkdir /usr/src/app/config \
+  && touch /var/log/cron.log \
+  && ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts \
+  && gem install bundler
+
+COPY config.ru /usr/src/app/
+COPY config/logger.yml /usr/src/app/config/
+COPY config/puma.rb /usr/src/app/config/
+COPY Gemfile.deploy /usr/src/app/Gemfile
+COPY Gemfile.deploy.lock /usr/src/app/Gemfile.lock
+COPY Rakefile /usr/src/app/
+COPY startup.sh /
+
+RUN bundle install --deployment --without=test development \
+  && bundle exec rake ditty:prep \
+  && chmod 755 /startup.sh
+
+ENV APP_ROOT="/usr/src/app"
+ENV RACK_ENV="production"
+
+ENTRYPOINT ["/startup.sh"]

data/Gemfile.ci

@@ -4,7 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'codeclimate-test-reporter', '~> 1.0.0'
-gem 'ditty', git: 'https://github.com/EagerELK/ditty.git', branch: 'master'
+#gem 'ditty', git: 'https://github.com/EagerELK/ditty.git', branch: 'master'
+gem 'ditty', path: '../ditty'
 gem 'dotenv'
 gem 'rspec'
 gem 'rubocop'

data/Gemfile.deploy

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'dotenv'
+gem 'pg'
+gem 'proxes'
+gem 'puma'
+gem 'rake'

data/Gemfile.deploy.lock

@@ -0,0 +1,124 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    backports (3.11.0)
+    bcrypt (3.1.11)
+    bcrypt-ruby (3.1.5)
+      bcrypt (>= 3.1.3)
+    concurrent-ruby (1.0.5)
+    ditty (0.3.2)
+      activesupport (>= 3)
+      bcrypt (~> 3.1)
+      haml (~> 5.0)
+      logger (~> 1.0)
+      omniauth (~> 1.0)
+      omniauth-identity (~> 1.0)
+      pundit (~> 1.0)
+      rack-contrib (~> 1.0)
+      rake (~> 12.0)
+      sequel (~> 4.0)
+      sinatra (~> 2.0)
+      sinatra-contrib (~> 2.0)
+      sinatra-flash (~> 0.3)
+      tilt (>= 2)
+      wisper (~> 2.0)
+    dotenv (2.2.1)
+    elasticsearch (6.0.0)
+      elasticsearch-api (= 6.0.0)
+      elasticsearch-transport (= 6.0.0)
+    elasticsearch-api (6.0.0)
+      multi_json
+    elasticsearch-transport (6.0.0)
+      faraday
+      multi_json
+    faraday (0.13.1)
+      multipart-post (>= 1.2, < 3)
+    haml (5.0.4)
+      temple (>= 0.8.0)
+      tilt
+    hashie (3.5.7)
+    highline (1.7.10)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    logger (1.2.8)
+    minitest (5.11.1)
+    multi_json (1.13.0)
+    multipart-post (2.0.0)
+    mustermann (1.0.1)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-http-basic (1.1.0)
+      omniauth (>= 1.0)
+    omniauth-identity (1.1.1)
+      bcrypt-ruby (~> 3.0)
+      omniauth (~> 1.0)
+    pg (1.0.0)
+    proxes (0.8.4)
+      activesupport (>= 3)
+      bcrypt (~> 3.1)
+      ditty (>= 0.2)
+      elasticsearch (>= 2)
+      haml (~> 5.0)
+      highline (~> 1.7)
+      logger (~> 1.0)
+      omniauth (~> 1.0)
+      omniauth-http-basic (~> 1.0)
+      omniauth-identity (~> 1.0)
+      pundit (~> 1.0)
+      rack-contrib (~> 1.0)
+      rake (~> 12.0)
+      sequel (~> 4.0)
+      sinatra (~> 2.0)
+      sinatra-contrib (~> 2.0)
+      sinatra-flash (~> 0.3)
+      tilt (>= 2)
+      wisper (~> 2.0)
+    puma (3.11.0)
+    pundit (1.1.0)
+      activesupport (>= 3.0.0)
+    rack (2.0.3)
+    rack-contrib (1.2.0)
+      rack (>= 0.9.1)
+    rack-protection (2.0.0)
+      rack
+    rake (12.3.0)
+    sequel (4.49.0)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
+    sinatra-contrib (2.0.0)
+      backports (>= 2.0)
+      multi_json
+      mustermann (~> 1.0)
+      rack-protection (= 2.0.0)
+      sinatra (= 2.0.0)
+      tilt (>= 1.3, < 3)
+    sinatra-flash (0.3.0)
+      sinatra (>= 1.0.0)
+    temple (0.8.0)
+    thread_safe (0.3.6)
+    tilt (2.0.8)
+    tzinfo (1.2.4)
+      thread_safe (~> 0.1)
+    wisper (2.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  dotenv
+  pg
+  proxes
+  puma
+  rake
+
+BUNDLED WITH
+   1.16.1

data/README.md

@@ -28,29 +28,20 @@ gem install proxes
 
 ## Usage
 
-1. Add the components to your rack config file. See the included [`config.ru`](https://github.com/EagerELK/proxes/blob/master/config.ru) file for an example setup
-2. Add the ProxES rake tasks to your Rakefile: `require 'proxes/rake_tasks'`
-3. Set the DB connection as the `DATABASE_URL` ENV variable: `DATABASE_URL=sqlite://development.db`
-4. Create and populate the DB and secret tokens:
+### As part of another project
+
+ProxES has two [components](https://github.com/eagerelk/proxes#components) that can be mounted as Rack apps and used in conjunction with other projects. Check the supplied files on how to add proxes to another project.
 
-```bash
-bundle exec rake proxes:prep
-bundle exec rake proxes:generate_tokens
-bundle exec rake proxes:migrate
-bundle exec rake proxes:seed
-bundle exec whenever --update-crontab
-```
 
-5. Create the necessary folders:
+### Docker
+
+ProxES can be run in a Docker container:
+
 
 ```bash
-mkdir tmp
-mkdir logs
-mkdir config
+docker run -e ELASTICSEARCH_URL=http://elasticsearch -e DATABASE_URL=postgres://username:password@database:5432/proxes --add-host=database:10.0.2.15 --add-host=elasticearch:10.0.2.15 eagerelk/proxes web-proxes
 ```
 
-6. Start up the web app: `bundle exec rackup`
-
 ## Components
 
 ProxES has two main components that works together, but can be used separately

data/Rakefile

@@ -1,15 +1,20 @@
 # frozen_string_literal: true
 
-require 'rake'
-require 'bundler/gem_tasks'
-require 'ditty/rake_tasks'
+require 'dotenv/load'
 
+require 'rake'
 require 'ditty'
-require 'proxes'
+require 'ditty/db' if ENV['DATABASE_URL']
 
+require 'ditty/components/app'
 Ditty.component :app
+
+require 'proxes'
 Ditty.component :proxes
 
+require 'ditty/rake_tasks'
+require 'bundler/gem_tasks' if File.exist? 'proxes.gemspec'
+
 begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:spec)

data/config.ru

@@ -4,38 +4,56 @@ libdir = File.expand_path(File.dirname(__FILE__) + '/lib')
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'dotenv/load'
-require 'proxes'
-require 'proxes/proxes'
-require 'rack/protection'
-ProxES::Container.plugin(:proxes)
 
+# Session
 use Rack::Session::Cookie,
     key: '_ProxES_session',
+    path: '/',
     # :secure=>!TEST_MODE, # Uncomment if only allowing https:// access
     secret: File.read('.session_secret')
+
+# Rack Protection
+require 'rack/protection'
 use Rack::Protection::RemoteToken
 use Rack::Protection::SessionHijacking
 
 map '/_proxes' do
-  require 'proxes/omniauth'
+  require 'ditty/components/app'
+  Ditty.component :app
 
-  use OmniAuth::Builder do
-    configure do |config|
-      config.path_prefix = '/auth'
-      config.on_failure = ProxES::App
-    end
+  require 'ditty/controllers/application'
+  Ditty::Application.set :map_path, '/_proxes'
+
+  require 'omniauth'
+  require 'omniauth/identity'
+  OmniAuth.config.logger = Ditty::Services::Logger.instance
+  OmniAuth.config.on_failure = proc { |env|
+    OmniAuth::FailureEndpoint.new(env).redirect_to_failure
+  }
 
+  require 'ditty/controllers/main'
+  require 'ditty/models/identity'
+  use OmniAuth::Builder do
     # The identity provider is used by the App.
     provider :identity,
              fields: [:username],
              callback_path: '/auth/identity/callback',
-             model: ProxES::Identity,
-             on_login: ProxES::App,
-             on_registration: ProxES::App,
+             model: Ditty::Identity,
+             on_login: Ditty::Main,
+             on_registration: Ditty::Main,
              locate_conditions: ->(req) { { username: req['username'] } }
   end
 
-  run Rack::URLMap.new Ditty.routes
+  # Management App
+  require 'proxes'
+  Ditty.component :proxes
+
+  run Rack::URLMap.new Ditty::Components.routes
+end
+
+require 'sidekiq/web'
+map '/_sidekiq' do
+  run Sidekiq::Web
 end
 
 map '/' do

data/config/puma.rb

@@ -0,0 +1,15 @@
+require 'dotenv/load'
+
+root = Dir.getwd.to_s
+threads_count = Integer(ENV['MAX_THREADS'] || 5)
+
+workers Integer(ENV['WEB_CONCURRENCY'] || 2)
+pidfile     "#{root}/pids/puma.pid"
+state_path  "#{root}/pids/puma.state"
+threads threads_count, threads_count
+
+bind 'tcp://0.0.0.0:9292'
+
+if File.exist?('./privkey.pem') && File.exist?('./fullchain.pem')
+  ssl_bind '0.0.0.0', 9293, key: './privkey.pem', cert: './fullchain.pem'
+end

data/lib/proxes/controllers/status.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require 'ditty/controllers/component'
+require 'ditty/controllers/application'
 require 'proxes/policies/status_policy'
-require 'proxes/helpers/es'
-require 'pp'
+require 'proxes/services/es'
 
 module ProxES
-  class Status < Ditty::Component
-    helpers ProxES::Helpers::ES
+  class Status < Ditty::Application
+    helpers ProxES::Services::ES
 
     def find_template(views, name, engine, &block)
       super(views, name, engine, &block) # Root
@@ -24,44 +23,80 @@ module ProxES
         checks << { text: 'Cluster Reachable', passed: true, value: health['cluster_name'] }
         checks << { text: 'Cluster Health', passed: health['status'] == 'green', value: health['status'] }
 
-        node_stats = client.nodes.stats metric: 'os,fs,jvm'
+        node_stats = client.nodes.stats
+
+        master_nodes = []
+        data_nodes = []
+        ingestion_nodes = []
+        node_stats['nodes'].values.each do |node|
+          if node['roles']
+            master_nodes << node['name'] if node['roles'].include? 'master'
+            data_nodes << node['name'] if node['roles'].include? 'data'
+            ingestion_nodes << node['name'] if node['roles'].include? 'ingest'
+          elsif node['attributes']
+            master_nodes << node['name'] unless node['attributes']['master'] == 'false'
+            data_nodes << node['name'] unless node['attributes']['data'] == 'false'
+            ingestion_nodes << node['name'] unless node['attributes']['ingest'] == 'false'
+          elsif node['settings']
+            master_nodes << node['name'] unless node['settings']['node']['master'] == 'false'
+            data_nodes << node['name'] unless node['settings']['node']['data'] == 'false'
+            ingestion_nodes << node['name'] unless node['settings']['node']['ingest'] == 'false'
+          end
+        end
+        checks << {
+          text: 'Master Nodes',
+          passed: master_nodes.count > 0,
+          value: master_nodes.count > 0 ? master_nodes.sort : 'None'
+        }
+        checks << {
+          text: 'Data Nodes',
+          passed: data_nodes.count > 0,
+          value: data_nodes.count > 0 ? data_nodes.sort : 'None'
+        }
+        checks << {
+          text: 'Ingestion Nodes',
+          passed: true,
+          value: ingestion_nodes.count > 0 ? ingestion_nodes.sort : 'None'
+        }
 
         jvm_values = []
         jvm_passed = true
-        node_stats['nodes'].each do |name, node|
-          jvm_values << "#{name}: #{node['jvm']['mem']['heap_used_percent']}%"
+        node_stats['nodes'].values.each do |node|
+          jvm_values << "#{node['name']}: #{node['jvm']['mem']['heap_used_percent']}%"
           jvm_passed = false if node['jvm']['mem']['heap_used_percent'] > 85
         end
-        checks << { text: 'Node JVM Heap', passed: jvm_passed, value: jvm_values }
+        checks << { text: 'Node JVM Heap', passed: jvm_passed, value: jvm_values.sort }
 
         fs_values = []
         fs_passed = true
-        node_stats['nodes'].each do |name, node|
+        node_stats['nodes'].values.each do |node|
+          next if node['attributes'] && node['attributes']['data'] == 'false'
+          next if node['roles'] && node['roles'].include?('data') == false
           stats = node['fs']['total']
           left = stats['available_in_bytes'] / stats['total_in_bytes'].to_f * 100
-          fs_values << "#{name}: #{'%.02f' % left}% Free"
+          fs_values << "#{node['name']}: #{'%.02f' % left}% Free"
           fs_passed = false if left < 10
         end
-        checks << { text: 'Node File Systems', passed: fs_passed, value: fs_values }
+        checks << { text: 'Node File Systems', passed: fs_passed, value: fs_values.sort }
 
         cpu_values = []
         cpu_passed = true
-        node_stats['nodes'].each do |name, node|
-          cpu_values << "#{name}: #{node['os']['cpu']['percent']}"
-          cpu_passed = false if node['os']['cpu']['percent'].to_i > 70
+        node_stats['nodes'].values.each do |node|
+          value = (node['os']['cpu_percent'] || node['os']['cpu']['percent'])
+          cpu_values << "#{node['name']}: #{value}"
+          cpu_passed = false if value.to_i > 70
         end
-        checks << { text: 'Node CPU Usage', passed: cpu_passed, value: cpu_values }
+        checks << { text: 'Node CPU Usage', passed: cpu_passed, value: cpu_values.sort }
 
         memory_values = []
         memory_passed = true
-        node_stats['nodes'].each do |name, node|
-          memory_values << "#{name}: #{node['os']['mem']['used_percent']}"
+        node_stats['nodes'].values.each do |node|
+          memory_values << "#{node['name']}: #{node['os']['mem']['used_percent']}"
           memory_passed = false if node['os']['mem']['used_percent'].to_i >= 100
         end
-        checks << { text: 'Node Memory Usage', passed: memory_passed, value: memory_values }
-
-      rescue StandardError
-        checks << { text: 'Cluster Reachable', passed: false}
+        checks << { text: 'Node Memory Usage', passed: memory_passed, value: memory_values.sort }
+      rescue Faraday::Error => e
+        checks << { text: 'Cluster Reachable', passed: false, value: e.message }
       end
 
       status checks.find { |c| c[:passed] == false } ? 500 : 200

data/lib/proxes/forwarder.rb

@@ -13,6 +13,13 @@ module ProxES
     def call(env)
       http = Net::HTTP.new(backend.host, backend.port)
       http.use_ssl = true if backend.is_a? URI::HTTPS
+      if ENV['SSL_VERIFY_NONE'].to_i == 1
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        store = OpenSSL::X509::Store.new
+        store.set_default_paths
+        http.cert_store = store
+      end
+
       request = request_from(env)
       request.basic_auth backend.user, backend.password
       response = http.request(request)

data/lib/proxes/request.rb

@@ -47,7 +47,7 @@ module ProxES
     private
 
     def path_parts
-      @path_parts ||= path[1..-1].split('/')
+      @path_parts ||= path.split('?')[0][1..-1].split('/')
     end
 
     def check_part(val)

data/lib/proxes/request/cat.rb

@@ -25,7 +25,7 @@ module ProxES
       end
 
       def indices?
-        true
+        %w[shards indices segments count recovery].include? type.first
       end
     end
   end

data/lib/proxes/security.rb

@@ -61,29 +61,28 @@ module ProxES
       error 'Elasticsearch not listening at ' + ENV['ELASTICSEARCH_URL']
     end
 
+    def log(request, stage)
+      logger.debug '============' + stage.ljust(56) + '============'
+      logger.debug '= ' + "Request: #{request.request_method} #{request.fullpath} (#{request.class.name})".ljust(76) + ' ='
+      logger.debug '= ' + "Endpoint: #{request.endpoint}".ljust(76) + ' ='
+      logger.debug '================================================================================'
+    end
+
     def call(env)
       @env = env
 
       request = Request.from_env(env)
       broadcast(:call_started, request)
 
-      logger.debug '==========================BEFORE================================================'
-      logger.debug '= ' + "Request: #{request.request_method} #{request.fullpath} (#{request.class.name})".ljust(76) + ' ='
-      logger.debug '= ' + "Endpoint: #{request.endpoint}".ljust(76) + ' ='
-      logger.debug '================================================================================'
-
+      log(request, 'BEFORE')
       unless env['PROXES_PASSTHROUGH']
         result = check(request)
         return result if result.is_a?(Array) # Rack Response
 
         request.index = policy_scope(request) if request.indices?
+        log(request, 'AFTER')
       end
 
-      logger.debug '==========================AFTER================================================='
-      logger.debug '= ' + "Request: #{request.request_method} #{request.fullpath} (#{request.class.name})".ljust(76) + ' ='
-      logger.debug '= ' + "Endpoint: #{request.endpoint}".ljust(76) + ' ='
-      logger.debug '================================================================================'
-
       forward request
     end
   end

data/lib/proxes/services/es.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'elasticsearch'
+require 'ditty/services/logger'
+
+module ProxES
+  module Services
+    module ES
+      def client
+        @client ||= Elasticsearch::Client.new(
+          url: ENV['ELASTICSEARCH_URL'],
+          transport_options: {
+            ssl: { verify: ENV['SSL_VERIFY_NONE'].to_i != 1 }
+          },
+          logger: Ditty::Services::Logger.instance
+        )
+      end
+
+      def cluster_health(level = 'cluster')
+        client.cluster.health level: level
+      end
+    end
+  end
+end

data/lib/proxes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProxES
-  VERSION = '0.8.4'.freeze
+  VERSION = '0.8.5'.freeze
 end

data/proxes.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'database_cleaner'
   spec.add_development_dependency 'factory_girl'
   spec.add_development_dependency 'timecop'
+  spec.add_development_dependency 'webmock'
 
   spec.add_dependency 'ditty', '>= 0.2'
   spec.add_dependency 'activesupport', '>= 3'

data/startup.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+set -e
+
+echo "DATABASE_URL: $DATABASE_URL"
+echo "ELASTICSEARCH_URL: $ELASTICSEARCH_URL"
+echo "APP_ROOT: $APP_ROOT"
+
+if [ "$1" = 'web-proxes' ]
+then
+  cd /usr/src/app
+  bundle exec rake ditty:generate_tokens
+  bundle exec rake ditty:migrate
+  bundle exec rake ditty:seed
+  bundle exec whenever --update-crontab
+  crond
+  exec bundle exec pumactl start "$@"
+fi
+
+exec "$@"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxes
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Jurgens du Toit
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ditty
   requirement: !ruby/object:Gem::Requirement
@@ -389,8 +403,11 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - Gemfile.ci
+- Gemfile.deploy
+- Gemfile.deploy.lock
 - Gemfile.dev
 - LICENSE.txt
 - README.md
@@ -401,13 +418,13 @@ files:
 - bin/setup
 - config.ru
 - config/logger.yml
+- config/puma.rb
 - gulpfile.js
 - lib/ditty/components/proxes.rb
 - lib/proxes.rb
 - lib/proxes/controllers/permissions.rb
 - lib/proxes/controllers/status.rb
 - lib/proxes/forwarder.rb
-- lib/proxes/helpers/es.rb
 - lib/proxes/helpers/indices.rb
 - lib/proxes/loggers/elasticsearch.rb
 - lib/proxes/models/permission.rb
@@ -432,6 +449,7 @@ files:
 - lib/proxes/request/snapshot.rb
 - lib/proxes/request/stats.rb
 - lib/proxes/security.rb
+- lib/proxes/services/es.rb
 - lib/proxes/version.rb
 - migrate/20170209_permissions.rb
 - migrate/20170416_user_specific_permissions.rb
@@ -450,6 +468,7 @@ files:
 - public/js/vendors.js
 - public/manifest.json
 - src/scripts/app.js
+- startup.sh
 - views/permissions/display.haml
 - views/permissions/edit.haml
 - views/permissions/form.haml

data/lib/proxes/helpers/es.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module ProxES
-  module Helpers
-    module ES
-      def client
-        @client ||= Elasticsearch::Client.new url: ENV['ELASTICSEARCH_URL']
-      end
-
-      def cluster_health(level = 'cluster')
-        client.cluster.health level: level
-      end
-    end
-  end
-end