rsm 0.1.rc1 → 0.1

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+.rvmrc

data/CHANGES.md

@@ -1,3 +1,9 @@
+# 0.1 / September 03, 2011
+
+  * Added support of auth_basic in Nginx config
+  * Added support of www-subdomain rewriting in Nginx config
+  * Option `domain` now is absolute (or use `hostname -f`)
+
 # 0.1.rc1 / August 31, 2011
 
   * Refactored tasks heirarchy

data/README.md

@@ -10,8 +10,8 @@ RSM created for make easier some actons on server like:
 This version can:
 
   * create Nginx virtual server config from template
-  * automaticly enable Nginx virtual server config
   * clone from Git repo or download and unpack Rails application from TGZ or TBZ2 archive
+  * generate Unicorn config from template
   * start and stop unicorn server
 
 Homepage
@@ -27,22 +27,28 @@ Created by Oleksandr (asux) Ulianytskyi
 License
 -------
 
-Source code has MIT license
+Source code has BSD license
 
 Installation
 ------------
 
 Install from RubyGems:
 
-    $ gem install rsm --pre
+    $ gem install rsm
+
+Or from source code:
+
+    $ git clone git://github.com/asux/rsm
+    $ cd rsm
+    $ rake install
 
 Ussage
 -----
 
 List avalable tasks:
-  
+
     $ rsm -T
-  
+
 Help for certain task:
 
     $ rsm help TASK

data/VERSION

@@ -1 +1 @@
-0.1.rc1
+0.1

data/lib/tasks/install/nginx.rb

@@ -1,10 +1,15 @@
 module Rsm
   module Install
     class Nginx < Rsm::Base
-      attr_reader :domain
+      attr_reader :domain, :rewrite_www, :auth_basic, :auth_basic_realm, :auth_basic_user_file
 
       class_option :nginx_root, :default => "/etc/nginx", :aliases => "-n", :desc => "Nginx configuration root"
       class_option :domain, :aliases => "-d", :desc => "Server's domain"
+      class_option :rewrite_www, :type => :boolean, :default => false, :desc => "Added www-subdomain rewriting"
+
+      class_option :auth_basic, :type => :boolean, :default => false, :aliases => "-a", :desc => "Use auth_basic"
+      class_option :auth_basic_realm, :desc => "auth_basic realm or capitalized NAME unless set"
+      class_option :auth_basic_user_file, :default => "htpasswd", :desc => "auth_basic user file relative path"
 
       def set_destination_root
         self.destination_root = options[:nginx_root]
@@ -19,12 +24,20 @@ module Rsm
 
       def nginx_unicorn_config
         @domain = options[:domain]
-        @domain = `hostname` unless @domain
+        @domain = "#{application_name}.`hostname -f`" unless @domain
+
+        @rewrite_www = options[:rewrite_www]
+
+        @auth_basic = options[:auth_basic]
+        @auth_basic_realm = options[:auth_basic_realm]
+        @auth_basic_realm = name.to_s.capitalize unless @auth_basic_realm
+        @auth_basic_user_file = options[:auth_basic_user_file]
+
         template "nginx-unicorn.conf.erb", "sites-available.d/#{name}.conf"
       end
 
       def enable_nginx_site
-        link_file "#{destination_root}/sites-available.d/#{name}.conf", "sites-enabled.d/#{name}.conf"
+        link_file "#{destination_root}/sites-available.d/#{name}.conf", "sites-enabled.d/#{name}.conf" unless FileTest.symlink?("#{destination_root}/sites-enabled.d/#{name}.conf")
       end
 
     end

data/rsm.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/asux/rsm'
   s.email = 'a.ulyanitsky@gmail.com'
   s.author = 'Oleksandr Ulianytskyi'
-  s.license = 'MIT'
+  s.license = 'BSD'
   s.version = Rsm::VERSION
   s.date = File.mtime(File.expand_path('VERSION',  File.dirname(__FILE__)))
   s.extra_rdoc_files = ['README.md', 'CHANGES.md', 'VERSION']

data/templates/rsm/install/nginx/nginx-unicorn.conf.erb

@@ -1,30 +1,46 @@
 upstream <%= name %>_server {
-   server unix:<%= application_root %>/tmp/sockets/unicorn.sock fail_timeout=0; # Местоположение сокета должно совпадать с настройками файла config/unicorn.rb от корня вашего приложения.
+  server unix:<%= application_root %>/tmp/sockets/unicorn.sock fail_timeout=0; # socket path must be same with last one in #{application_root}/config/unicorn.rb
 }
 
 server {
-    listen 80; # Опять же, если на одном и том же ip находится несколько серверов, то эта строка будет выглядеть как-то так myapp.mydomain.ru:80
-    server_name <%= name %>.<%= domain %>; # Имя сервера
+  listen <%= domain %>:80;
+  server_name <%= domain %><%= if rewrite_www then "www.#{domain}" end -%>;
 
-    client_max_body_size 1G; # Максимальный размер тела запроса (а простым языком - ограничение на размер заливаемого на сервер файла).
-    keepalive_timeout 5;
-    root <%= application_root %>/public; # Эта строка всегда должна указывать в директорию public Rails приложения. А current там потому что деплой происходит через Capistrano
+  client_max_body_size 1G;
+  keepalive_timeout 5;
+  root <%= application_root %>/public;
 
-    try_files $uri/index.html $uri.html $uri @<%= name %>; # Имя переменной не важно - главное, чтобы в блоке location ниже было аналогичное
+  try_files $uri/index.html $uri.html $uri @<%= name %>;
 
-    access_log <%= application_root %>/log/access.log;
-    error_log <%= application_root %>/log/error.log;
+  access_log <%= application_root %>/log/access.log;
+  error_log <%= application_root %>/log/error.log;
 
-    location @<%= name %> {
-        proxy_pass http://<%= name %>_server; # Часть после http:// должна полностью соответствовать имени в блоке upstream выше.
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header Host $http_host;
-        proxy_redirect off;
+  location @<%= name %> {
+    <% if auth_basic -%>
+    auth_basic            "<%= auth_basic_realm %>";
+    auth_basic_user_file  <%= auth_basic_user_file%>;
+    <% end -%>
+
+    <% if rewrite_www -%>
+    if ($host ~* www\.(.*)) {
+      set $host_without_www $1;
+      rewrite ^(.*)$ http://$host_without_www$1 permanent; # $1 contains '/foo', not 'www.mydomain.com/foo'}
     }
+    <% end -%>
 
-    error_page 500 502 503 504 /500.html;
-    location = /500.html {
-      root <%= application_root %>/public;
+    if (!-f $request_filename) {
+      proxy_pass http://<%= name %>_server;
+      break;
     }
+
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header Host $http_host;
+    proxy_redirect off;
+  }
+
+  error_page 500 502 503 504 /500.html;
+  location = /500.html {
+    root <%= application_root %>/public;
+  }
 }
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rsm
 version: !ruby/object:Gem::Version
-  version: 0.1.rc1
-  prerelease: 4
+  version: '0.1'
+  prerelease: 
 platform: ruby
 authors:
 - Oleksandr Ulianytskyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000Z
+date: 2011-09-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &19351848 !ruby/object:Gem::Requirement
+  requirement: &72172910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *19351848
+  version_requirements: *72172910
 description: Thor tasks for rapid deployment new rails apps on server
 email: a.ulyanitsky@gmail.com
 executables:
@@ -33,7 +33,6 @@ extra_rdoc_files:
 - VERSION
 files:
 - .gitignore
-- .rvmrc
 - CHANGES.md
 - Gemfile
 - README.md
@@ -54,7 +53,7 @@ files:
 - templates/rsm/install/rails/unicorn.rb.erb
 homepage: https://github.com/asux/rsm
 licenses:
-- MIT
+- BSD
 post_install_message: 
 rdoc_options:
 - --main
@@ -71,9 +70,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - A coreutils installed
 - A Git installed

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.8.7