redirus 0.1.2 → 0.2.1

data/spec/redirus/config_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Redirus::Config do
 
   context 'loading default values' do
-    let(:config) { Redirus::Config.new 'nonexisting_config_file' }
+    let(:config) { Redirus::Config.new('nonexisting_config_file') }
 
     it 'returns redis config' do
       expect(config.queues).to eq ['default']
@@ -14,15 +14,16 @@ describe Redirus::Config do
     it 'returns nginx files location' do
       expect(config.nginx_pid_file).to eq 'nginx.pid'
       expect(config.configs_path).to eq 'sites-enabled'
-      expect(config.http_template).to eq 'listen *:80;'
-      expect(config.https_template).to start_with 'listen *:443 ssl;'
-      expect(config.config_template).to start_with '#{upstream}'
+      expect(config.http_template).to eq 'http.conf.erb'
+      expect(config.https_template).to start_with 'https.conf.erb'
       expect(config.allowed_properties).to eq []
     end
   end
 
   context 'loading config from file' do
-    let(:config) { Redirus::Config.new File.join(SPEC_DIR, 'resources', 'config.yml') }
+    let(:config) do
+      Redirus::Config.new(File.join(SPEC_DIR, 'resources', 'config.yml'))
+    end
 
     it 'returns redis config' do
       expect(config.queues).to eq ['first', 'second']
@@ -33,9 +34,8 @@ describe Redirus::Config do
     it 'returns nginx files location' do
       expect(config.nginx_pid_file).to eq 'configfile-nginx.pid'
       expect(config.configs_path).to eq 'configfile-sites-enabled'
-      expect(config.http_template).to eq 'listen *:8000;'
-      expect(config.https_template).to start_with 'listen *:8443 ssl;'
-      expect(config.config_template).to start_with '## configfile'
+      expect(config.http_template).to eq '/path/to/http/tmpl'
+      expect(config.https_template).to start_with '/path/to/https/tmpl'
       expect(config.allowed_properties).to eq ['proxy_send_timeout \d', 'proxy_read_timeout \d']
     end
   end

data/spec/redirus/proxy_spec.rb

@@ -9,7 +9,7 @@ describe Redirus::Proxy do
   }
 
   before do
-    Redirus.stub(:config).and_return(config)
+    allow(Redirus).to receive(:config).and_return(config)
     allow(File).to receive(:open).with('nginx_pid_file').and_yield(nginx_pid_file)
     allow(nginx_pid_file).to receive(:read).and_return('123')
   end

data/spec/redirus/worker/add_proxy_spec.rb

@@ -6,19 +6,8 @@ describe Redirus::Worker::AddProxy do
   let(:config) {
     double('worker configuration',
       configs_path: 'configs_base_path',
-      http_template: 'http_section',
-      https_template: 'https_section',
-      base_server_name: 'localhost',
-      config_template: %q[#{upstream}
-        server {
-          #{listen}
-          server_name #{name}.my.server.pl;
-          location / {
-            proxy_pass http://#{upstream_name};
-            #{properties}
-          }
-        }
-      ],
+      http_template: File.join(resources_dir, 'http.erb.conf'),
+      https_template: File.join(resources_dir, 'https.erb.conf'),
       allowed_properties: ['proxy_send_timeout \d', 'proxy_read_timeout \d'],
       nginx_pid_file: 'nginx_pid_file'
     )
@@ -39,19 +28,23 @@ describe Redirus::Worker::AddProxy do
     end
 
     it 'sets http listen section' do
-      expect(proxy_file).to have_received(:write).with(/.*http_section.*/)
+      expect(proxy_file).to have_received(:write).
+        with(/.*listen 123.123.123.135:80.*/)
     end
 
     it 'sets http upstream name in proxy pass section' do
-      expect(proxy_file).to have_received(:write).with(/.*proxy_pass http:\/\/subdomain_http;.*/)
+      expect(proxy_file).to have_received(:write).
+        with(/.*proxy_pass http:\/\/subdomain_http;.*/)
     end
 
     it 'has http upstream section with 2 upstream servers' do
-      expect(proxy_file).to have_received(:write).with(/.*upstream subdomain_http {\n\s*server 10.100.10.112:80;\n\s*server 10.100.10.113:80;\n\s*}.*/)
+      expect(proxy_file).to have_received(:write).
+        with(/.*upstream subdomain_http {\n\s*server 10.100.10.112:80;\n\s*server 10.100.10.113:80;\n\s*}.*/)
     end
 
     it 'sets subdomain.my.server.pl server name' do
-      expect(proxy_file).to have_received(:write).with(/.*subdomain\.my\.server\.pl;.*/)
+      expect(proxy_file).to have_received(:write).
+        with(/.*subdomain\.my\.server\.pl;.*/)
     end
 
     it 'restarts nginx' do
@@ -61,40 +54,63 @@ describe Redirus::Worker::AddProxy do
 
   context 'when https redirection is required' do
     before do
-      allow(File).to receive(:open).with('configs_base_path/subdomain_https', 'w').and_yield(proxy_file)
+      allow(File).to receive(:open).
+        with('configs_base_path/subdomain_https', 'w').
+        and_yield(proxy_file)
       allow(proxy_file).to receive(:write)
+
       subject.perform('subdomain', ['10.100.10.112:80'], :https)
     end
 
     it 'sets https listen section' do
-      expect(proxy_file).to have_received(:write).with(/.*https_section.*/)
+      expect(proxy_file).to have_received(:write).
+        with(/.*listen 123.123.123.135:443 ssl;.*/)
     end
 
     it 'sets https upstream name in proxy pass section' do
-      expect(proxy_file).to have_received(:write).with(/.*proxy_pass http:\/\/subdomain_https;.*/)
+      expect(proxy_file).to have_received(:write).
+        with(/.*proxy_pass http:\/\/subdomain_https;.*/)
     end
 
     it 'has https upstream section with upstream server' do
-      expect(proxy_file).to have_received(:write).with(/.*upstream subdomain_https {\n\s*server 10.100.10.112:80;\n\s*}.*/)
+      expect(proxy_file).to have_received(:write).
+        with(/.*upstream subdomain_https {\n\s*server 10.100.10.112:80;\n\s*}.*/)
     end
   end
 
   context 'when redirection with properties is required' do
     before do
-      allow(File).to receive(:open).with('configs_base_path/subdomain_http', 'w').and_yield(proxy_file)
+      allow(File).to receive(:open).
+        with('configs_base_path/subdomain_http', 'w').
+        and_yield(proxy_file)
       allow(proxy_file).to receive(:write)
     end
 
     it 'writes static properties into location section' do
-      expect(proxy_file).to receive(:write).with(/location \/ {\s*.*\s*proxy_send_timeout 600;\s*proxy_read_timeout 600;\s*}/)
+      expect(proxy_file).to receive(:write).
+        with(/location \/ {\s*.*\s*proxy_send_timeout 600;\s*proxy_read_timeout 600;\s*}/)
 
-      subject.perform('subdomain', ['10.100.10.112:80'], :http, ['proxy_send_timeout 600', 'proxy_read_timeout 600'])
+      subject.perform('subdomain', ['10.100.10.112:80'], :http,
+                      ['proxy_send_timeout 600', 'proxy_read_timeout 600'])
     end
 
     it 'discard not allowed properties' do
       expect(proxy_file).to_not receive(:write).with(/not allowed property/)
 
-      subject.perform('subdomain', ['10.100.10.112:80'], :http, ['not allowed property'])
+      subject.perform('subdomain', ['10.100.10.112:80'], :http,
+                      ['not allowed property'])
     end
   end
+
+  it 'parse specific options' do
+    allow(File).to receive(:open).
+      with('configs_base_path/options_http', 'w').
+      and_yield(proxy_file)
+
+    expect(proxy_file).to receive(:write).
+      with(/upstream options_http {\n\s*ip_hash;/)
+
+    subject.perform('options', ['10.100.10.112:80'], :http, [],
+                    load_balancing: :ip_hash)
+  end
 end

data/spec/resources/config.yml

@@ -6,24 +6,8 @@ namespace: configfile-redirus
 nginx:
   pid: configfile-nginx.pid
   configs_path: configfile-sites-enabled
-  http_template: 'listen *:8000;'
-  https_template: |
-    listen *:8443 ssl;
-    ssl_certificate     /usr/share/ssl/certs/localhost/host.cert;
-    ssl_certificate_key /usr/share/ssl/certs/localhost/host.key;
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-  config_template: |
-    ## configfile
-    #{upstream}
-    server {
-      #{listen}
-      server_name #{name}.localhost;
-      server_tokens off;
-      location / {
-        proxy_pass http://#{upstream_name};
-        #{properties}
-      }
-    }
+  http_template: /path/to/http/tmpl
+  https_template: /path/to/https/tmpl
   allowed_properties:
     - proxy_send_timeout \d
-    - proxy_read_timeout \d
+    - proxy_read_timeout \d

data/spec/resources/http.erb.conf

@@ -0,0 +1,19 @@
+upstream <%= @name %>_http {
+<% if @options[:load_balancing] == :ip_hash -%>
+  ip_hash;
+<% end -%>
+<% for worker in @workers -%>
+  server <%= worker %>;
+<% end -%>
+}
+
+server {
+  listen 123.123.123.135:80;
+  server_name <%= @name %>.my.server.pl;
+  location / {
+    proxy_pass http://<%= @name %>_http;
+<% for property in @location_properties -%>
+    <%= property %>;
+<% end -%>
+  }
+}

data/spec/resources/https.erb.conf

@@ -0,0 +1,21 @@
+upstream <%= @name %>_https {
+<% for worker in @workers -%>
+  server <%= worker %>;
+<% end -%>
+}
+
+server {
+  listen 123.123.123.135:443 ssl;
+  server_name <%= @name %>.my.server.pl;
+
+  ssl_certificate     /path/to/cert/dir/server.crt;
+  ssl_certificate_key /path/to/cert/dir/server.key;
+  ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+
+  location / {
+    proxy_pass http://<%= @name %>_https;
+<% for property in @location_properties -%>
+    <%= property %>;
+<% end -%>
+  }
+}

data/spec/support/resources.rb

@@ -0,0 +1,3 @@
+def resources_dir
+  File.join(File.dirname(__FILE__), '..', 'resources')
+end

data/templates/config.yml

@@ -0,0 +1,16 @@
+queues:
+<% for queue in @options[:queues] -%>
+  - <%= queue %>
+<% end -%>
+
+redis_url: <%= @options[:redis] %>
+namespace: redirus
+
+nginx:
+  configs_path: <%= @options[:configs_dir] %>
+  pid: <%= @options[:pid] %>
+  http_template: <%= @options[:http_template] %>
+  https_template: <%= @options[:https_template] %>
+  allowed_properties:
+    - proxy_sent_timeout \d
+    - proxy_read_timeout \d

data/templates/http.conf.erb

@@ -0,0 +1,17 @@
+upstream <%%= @name %>_http {
+<%% for worker in @workers -%>
+  server <%%= worker %>;
+<%% end -%>
+}
+
+server {
+  listen <%= @options[:ip] %>:80;
+  server_name <%%= @name %>.<%= @options[:server_name] %>;
+
+  location / {
+    proxy_pass http://<%%= @name %>_http;
+<%% for property in @location_properties -%>
+    <%%= property %>;
+<%% end -%>
+  }
+}

data/templates/https.conf.erb

@@ -0,0 +1,21 @@
+upstream <%%= @name %>_https {
+<%% for worker in @workers -%>
+  server <%%= worker %>;
+<%% end -%>
+}
+
+server {
+  listen <%= @options[:ip] %>:443 ssl;
+  server_name <%%= @name %>.<%= @options[:server_name] %>;
+
+  ssl_certificate     <%= @options[:ssl_cert] %>;
+  ssl_certificate_key <%= @options[:ssl_cert_key] %>;
+  ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+
+  location / {
+    proxy_pass http://<%%= @name %>_https;
+<%% for property in @location_properties -%>
+    <%%= property %>;
+<%% end -%>
+  }
+}

data/templates/nginx.conf

@@ -0,0 +1,24 @@
+worker_processes  1;
+
+pid <%= @options[:pid] %>;
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    sendfile        on;
+    keepalive_timeout  65;
+
+    types_hash_max_size 2048;
+    server_names_hash_bucket_size  128;
+
+    access_log <%= @options[:configs_dir] %>/access.log;
+    error_log  <%= @options[:configs_dir] %>/error.log;
+
+    include <%= @options[:configs_dir] %>/*;
+}

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: redirus
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Marek Kasztelnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: rspec-sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   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'
 description: Redirus
@@ -114,14 +114,15 @@ email:
 executables:
 - redirus
 - redirus-client
+- redirus-init
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .hound.yml
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".hound.yml"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -131,12 +132,15 @@ files:
 - Rakefile
 - bin/redirus
 - bin/redirus-client
-- config.yml.example
+- bin/redirus-init
 - lib/redirus.rb
 - lib/redirus/cli.rb
+- lib/redirus/cli/client.rb
+- lib/redirus/cli/init.rb
+- lib/redirus/cli/server.rb
 - lib/redirus/config.rb
 - lib/redirus/proxy.rb
-- lib/redirus/server_cli.rb
+- lib/redirus/utils.rb
 - lib/redirus/version.rb
 - lib/redirus/worker.rb
 - lib/redirus/worker/add_proxy.rb
@@ -147,11 +151,18 @@ files:
 - spec/redirus/worker/add_proxy_spec.rb
 - spec/redirus/worker/rm_proxy_spec.rb
 - spec/resources/config.yml
+- spec/resources/http.erb.conf
+- spec/resources/https.erb.conf
 - spec/spec_helper.rb
 - spec/support/matchers.rb
+- spec/support/resources.rb
 - support/upstart/redirus-nginx.conf
 - support/upstart/redirus-sidekiq.conf
 - support/upstart/redirus.conf
+- templates/config.yml
+- templates/http.conf.erb
+- templates/https.conf.erb
+- templates/nginx.conf
 homepage: https://github.com/dice-cyfronet/redirus
 licenses:
 - MIT
@@ -162,17 +173,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Redirus is responsible for managing http/https redirections
@@ -182,5 +193,8 @@ test_files:
 - spec/redirus/worker/add_proxy_spec.rb
 - spec/redirus/worker/rm_proxy_spec.rb
 - spec/resources/config.yml
+- spec/resources/http.erb.conf
+- spec/resources/https.erb.conf
 - spec/spec_helper.rb
 - spec/support/matchers.rb
+- spec/support/resources.rb

data/config.yml.example

@@ -1,33 +0,0 @@
-queues:
-  - site_prefix
-  - second_site_prefix
-
-redis_url: redis://localhost:6379
-namespace: redirus
-
-nginx:
-  configs_path: /path/to/dir/with/nginx/configs/
-  pid: /path/to/nginx.pid
-  http_template: |
-    listen *:80;
-  https_template: |
-    listen *:443 ssl;
-    ssl_certificate     /path/to/cert/dir/server.crt;
-    ssl_certificate_key /path/to/cert/dir/server.key;
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-  config_template: |
-    #{upstream}
-    server {
-      #{listen}
-      server_name #{name}.my-domain.pl;
-      server_tokens off;
-      proxy_set_header X-Server-Address $scheme://#{name}.my-domain.pl;
-      proxy_set_header Host $http_host;
-      location / {
-        proxy_pass http://#{upstream_name};
-        #{properties}
-      }
-    }
-  allowed_properties:
-    - proxy_sent_timeout \d
-    - proxy_read_timeout \d

data/lib/redirus/server_cli.rb

@@ -1,86 +0,0 @@
-require 'optparse'
-require 'singleton'
-require 'sidekiq/cli'
-
-Sidekiq.configure_server do |config|
-  config.redis = {
-    namespace: Redirus.config.namespace,
-    url: Redirus.config.redis_url
-  }
-end
-
-module Redirus
-  class ServerCLI
-    include Singleton
-
-    attr_reader :options
-
-    def parse(args = ARGV)
-      init_options(args)
-      validate!
-    end
-
-    def run
-      sidekiq_cli = Sidekiq::CLI.instance
-      args = queues + [
-        '-c', '1',
-        '-r', runner_path,
-        options[:config_path]
-      ]
-
-      sidekiq_cli.parse(args)
-      sidekiq_cli.run
-    end
-
-    private
-
-    def queues
-      Redirus.config.queues.inject([]) do |arr, q|
-        arr << '-q'
-        arr << q
-      end
-    end
-
-    def runner_path
-      module_path = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-      File.join(module_path, 'redirus.rb')
-    end
-
-    def init_options(args)
-      opts = parse_options(args)
-      opts[:config_path] ||= 'config.yml'
-
-      Redirus.config_path = opts[:config_path]
-
-      @options = opts
-    end
-
-    def parse_options(args)
-      opts = {}
-
-      OptionParser.new do |o|
-        o.banner = 'Usage: redirus [options]'
-
-        o.on('-c',
-             '--configuration PATH',
-             'Yaml redirus configuration path') do |arg|
-          opts[:config_path] = arg
-        end
-
-        o.on_tail('-h', '--help', 'Show this message') do
-          puts opts
-          exit
-        end
-      end.parse!
-
-      opts
-    end
-
-    def validate!
-      unless File.exist?(options[:config_path])
-        puts "ERROR: Configuration file #{options[:config_path]} does not exist"
-        exit(1)
-      end
-    end
-  end
-end