capistrano-nginx-unicorn 0.0.1 → 0.0.2

data/README.md

@@ -84,41 +84,70 @@ you can run any of these tasks to update configuration.
 
 You can customize nginx and unicorn configs using capistrano variables:
 
-    # path to customized templates (see below for details)
-    # default value: "config/deploy/templates"
-    set :templates_path, "config/deploy/templates"
 
-    # server name for nginx, default value: no (will be prompted if not set)
-    # set this to your site name as it is visible from outside
-    # this will allow 1 nginx to serve several sites with different `server_name`
-    set :nginx_server_name, "example.com"
-
-    # path, where unicorn pid file will be stored
-    # default value: `"#{current_path}/tmp/pids/unicorn.pid"`
-    set :unicorn_pid, "#{current_path}/tmp/pids/unicorn.pid"
-
-    # path, where unicorn config file will be stored
-    # default value: `"#{shared_path}/config/unicorn.rb"`
-    set :unicorn_config, "#{shared_path}/config/unicorn.rb"
-
-    # path, where unicorn log file will be stored
-    # default value: `"#{shared_path}/config/unicorn.rb"`
-    set :unicorn_log, "#{shared_path}/config/unicorn.rb"
-
-    # user name to run unicorn
-    # default value: `user` (user varibale defined in your `deploy.rb`)
-    set :unicorn_user, "user"
-
-    # number of unicorn workers
-    # default value: no (will be prompted if not set)
-    set :unicorn_workers, 4
+```ruby
+# path to customized templates (see below for details)
+# default value: "config/deploy/templates"
+set :templates_path, "config/deploy/templates"
+
+# server name for nginx, default value: no (will be prompted if not set)
+# set this to your site name as it is visible from outside
+# this will allow 1 nginx to serve several sites with different `server_name`
+set :nginx_server_name, "example.com"
+
+# path, where unicorn pid file will be stored
+# default value: `"#{current_path}/tmp/pids/unicorn.pid"`
+set :unicorn_pid, "#{current_path}/tmp/pids/unicorn.pid"
+
+# path, where unicorn config file will be stored
+# default value: `"#{shared_path}/config/unicorn.rb"`
+set :unicorn_config, "#{shared_path}/config/unicorn.rb"
+
+# path, where unicorn log file will be stored
+# default value: `"#{shared_path}/config/unicorn.rb"`
+set :unicorn_log, "#{shared_path}/config/unicorn.rb"
+
+# user name to run unicorn
+# default value: `user` (user varibale defined in your `deploy.rb`)
+set :unicorn_user, "user"
+
+# number of unicorn workers
+# default value: no (will be prompted if not set)
+set :unicorn_workers, 4
+
+# if set, nginx will be configured to 443 port and port 80 will be auto rewritten to 443
+# also, on `nginx:setup`, paths to ssl certificate and key will be configured
+# and certificate file and key will be copied to `/etc/ssl/certs` and `/etc/ssl/private/` directories
+# default value: false
+set :nginx_use_ssl, false
+
+# remote file name of the certificate, only makes sense if `nginx_use_ssl` is set
+# default value: `nginx_server_name + ".crt"`
+set :nginx_ssl_certificate, "#{nginx_server_name}.crt"
+
+# remote file name of the certificate, only makes sense if `nginx_use_ssl` is set
+# default value: `nginx_server_name + ".key"`
+set :nginx_ssl_certificate_key, "#{nginx_server_name}.key"
+
+# local path to file with certificate, only makes sense if `nginx_use_ssl` is set
+# this file will be copied to remote server
+# default value: none (will be prompted if not set)
+set :nginx_ssl_certificate_local_path, "/home/ivalkeen/ssl/myssl.cert"
+
+# local path to file with certificate key, only makes sense if `nginx_use_ssl` is set
+# this file will be copied to remote server
+# default value: none (will be prompted if not set)
+set :nginx_ssl_certificate_key_local_path, "/home/ivalkeen/ssl/myssl.key"
+```
 
 For example, of you site name is `example.com` and you want to use 8 unicorn workers,
 your `deploy.rb` will look like this:
 
-    set :server_name, "example.com"
-    set :unicorn_workers, 4
-    require 'capistrano-nginx-unicorn'
+```ruby
+set :server_name, "example.com"
+set :unicorn_workers, 4
+require 'capistrano-nginx-unicorn'
+```
 
 ### Template Customization
 

data/lib/capistrano/nginx_unicorn/tasks.rb

@@ -4,6 +4,11 @@ Capistrano::Configuration.instance.load do
   set_default(:templates_path, "config/deploy/templates")
 
   set_default(:nginx_server_name) { Capistrano::CLI.ui.ask "Nginx server name: " }
+  set_default(:nginx_use_ssl, false)
+  set_default(:nginx_ssl_certificate, "#{nginx_server_name}.crt")
+  set_default(:nginx_ssl_certificate_key, "#{nginx_server_name}.key")
+  set_default(:nginx_ssl_certificate_local_path) {Capistrano::CLI.ui.ask "Local path to ssl certificate: "}
+  set_default(:nginx_ssl_certificate_key_local_path) {Capistrano::CLI.ui.ask "Local path to ssl certificate key: "}
 
   set_default(:unicorn_pid, "#{current_path}/tmp/pids/unicorn.pid")
   set_default(:unicorn_config, "#{shared_path}/config/unicorn.rb")
@@ -17,6 +22,17 @@ Capistrano::Configuration.instance.load do
       template("nginx_conf.erb", "/tmp/#{application}")
       run "#{sudo} mv /tmp/#{application} /etc/nginx/sites-available/#{application}"
       run "#{sudo} ln -fs /etc/nginx/sites-available/#{application} /etc/nginx/sites-enabled/#{application}"
+
+      if nginx_use_ssl
+        put File.read(nginx_ssl_certificate_local_path), "/tmp/#{nginx_ssl_certificate}"
+        put File.read(nginx_ssl_certificate_key_local_path), "/tmp/#{nginx_ssl_certificate_key}"
+
+        run "#{sudo} mv /tmp/#{nginx_ssl_certificate} /etc/ssl/certs/#{nginx_ssl_certificate}"
+        run "#{sudo} mv /tmp/#{nginx_ssl_certificate_key} /etc/ssl/private/#{nginx_ssl_certificate_key}"
+
+        run "#{sudo} chown root:root /etc/ssl/certs/#{nginx_ssl_certificate}"
+        run "#{sudo} chown root:root /etc/ssl/private/#{nginx_ssl_certificate_key}"
+      end
     end
 
     after "deploy:setup", "nginx:setup"

data/lib/capistrano/nginx_unicorn/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module NginxUnicorn
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/generators/capistrano/nginx_unicorn/templates/nginx_conf.erb

@@ -2,8 +2,23 @@ upstream unicorn_<%= application %> {
   server unix:/tmp/unicorn.<%= application %>.sock fail_timeout=0;
 }
 
+<% if nginx_use_ssl %>
 server {
   listen 80;
+  rewrite ^(.*) https://$host$1 permanent;
+}
+<% end %>
+
+server {
+<% if nginx_use_ssl %>
+  listen 443;
+  ssl on;
+  ssl_certificate /etc/ssl/certs/<%= nginx_ssl_certificate %>;
+  ssl_certificate_key /etc/ssl/private/<%= nginx_ssl_certificate_key %>;
+<% else %>
+  listen 80;
+<% end %>
+
   server_name <%= nginx_server_name %>;
   root <%= current_path %>/public;
   try_files $uri/index.html $uri @unicorn_<%= application %>;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nginx-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -79,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2151274067948030801
+      hash: 3183296654064294828
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2151274067948030801
+      hash: 3183296654064294828
   none: false
 requirements: []
 rubyforge_project: