rsm 0.1.5 → 0.1.7

data/CHANGES.md

@@ -1,5 +1,14 @@
+# 0.1.7 / September 12, 2011
+
+  * Fixed upsream name
+
+# 0.1.6 / September 12, 2011
+
+  * Name of upsream server based on domain
+  * Permission update at the end of group
+
 # 0.1.5 / September 06, 2011
-  
+
   * Changed virtual host config filename for Nginx. It's now domain-based instead of name-based.
 
 # 0.1.4 / September 06, 2011

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.7

data/lib/tasks/install/nginx.rb

@@ -1,7 +1,7 @@
 module Rsm
   module Install
     class Nginx < Rsm::Base
-      attr_reader :domain, :rewrite_www, :auth_basic, :auth_basic_realm, :auth_basic_user_file
+      attr_reader :domain, :rewrite_www, :auth_basic, :auth_basic_realm, :auth_basic_user_file, :upstream_name
 
       class_option :nginx_root, :default => "/etc/nginx", :aliases => "-n", :desc => "Nginx configuration root"
       class_option :domain, :aliases => "-d", :desc => "Server's domain"
@@ -36,6 +36,8 @@ module Rsm
         @auth_basic_realm = name.to_s.capitalize unless @auth_basic_realm
         @auth_basic_user_file = options[:auth_basic_user_file]
 
+        @upstream_name = "#{domain}_server"
+
         template "nginx-server.conf.erb", "sites-available.d/#{domain}.conf"
       end
 

data/lib/tasks/install/rails.rb

@@ -26,15 +26,6 @@ module Rsm
         end
       end
 
-      def permissions
-        inside "." do
-          empty_directory "log"
-          empty_directory "tmp"
-          run "chown #{options[:user]}:#{options[:group]} -R ."
-          run "chmod 755 log tmp"
-        end
-      end
-
       def unicorn_config
         template "unicorn.rb.erb", "config/unicorn.rb"
       end
@@ -51,6 +42,14 @@ module Rsm
         send("#{server}_config")
       end
 
+      def permissions
+        inside "." do
+          empty_directory "log"
+          empty_directory "tmp"
+          run "chown #{options[:user]}:#{options[:group]} -R ."
+          run "chmod 755 log tmp"
+        end
+      end
     end
   end
 end

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

@@ -1,4 +1,4 @@
-upstream <%= name %>_server {
+upstream <%= upstream_name %> {
 <%- if socket_per_worker -%>
   <%- (0...worker_processes).each do |n| -%>
   server unix:<%= application_root %>/tmp/sockets/<%= server %>.<%= n %>.sock fail_timeout=0; # socket path must be same with last one in #{application_root}/config/unicorn.rb
@@ -35,7 +35,7 @@ server {
     <%- end -%>
 
     if (!-f $request_filename) {
-      proxy_pass http://<%= name %>_server;
+      proxy_pass http://<%= upstream_name %>;
       break;
     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsm
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-06 00:00:00.000000000Z
+date: 2011-09-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &17564184 !ruby/object:Gem::Requirement
+  requirement: &13523712 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *17564184
+  version_requirements: *13523712
 description: Thor tasks for rapid deployment new rails apps on server
 email: a.ulyanitsky@gmail.com
 executables: