cap-uwsgi 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39d5845a45cbbc925b9bbf521cd50dc68e55054
-  data.tar.gz: e197fe634cd316cd1334703c826e23b1dca195fd
+  metadata.gz: 39ea83fc246f65843555078382ec2d67ddd1fd95
+  data.tar.gz: 611f9c4fd160c8c157692b1c206ea5c1db4acaaa
 SHA512:
-  metadata.gz: db6a117e3f2eefe089c25eb64c04919c7eef83abe4ddb8d1014195c3849b1d805fac5879f2a88927a8eac70eebeeb029bf5dd1dc32e5873fd351ee792eada51b
-  data.tar.gz: e76fc46483f7330d4e4e999551061a3d2cfa64dfecd756d9f8fc4cf02c655499ecca09fddcb9227e22382532049bc85a2a0aca59b5c32c6dc264c91c4b0d35e8
+  metadata.gz: 87174c18969c5a9ae0d1468a06cfa6ad778fd651b366b28960f71eb2853efd5e79582a89ab527df7cbbf0e68aec6c3837d23eaab80f24bc8514f5c259d3a797c
+  data.tar.gz: ddea541a9271e9097e67d37b02fb22bc3f247796583cff75ac3f09607bad5bf38d59f663f0e077d4e05ff2c4c8892acb9567378e12c95b93a3cac63808261be4

data/.gitignore

@@ -1,5 +1,4 @@
 puma
-sh
 *~
 pkg
 tmp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-uwsgi (0.0.1)
+    cap-uwsgi (0.0.1)
       capistrano (~> 3.0)
 
 GEM
@@ -11,6 +11,7 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
+    gem-release (0.7.1)
     i18n (0.6.9)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
@@ -28,4 +29,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capistrano-uwsgi!
+  cap-uwsgi!
+  gem-release

data/Readme.md

@@ -4,7 +4,13 @@
 
 gem 'cap-uwsgi'
 
+### Workflow
+
+* cap _stage uwsgi:emperor:setup #firstly once
+* cap _stage deploy #all is running
+
 ### Ref 
 
-* https://github.com/cao7113/uwsgi-rails-demo
+* https://github.com/cao7113/railslab
 * capistrano-puma
+* web: http://uwsgi-docs.readthedocs.org/en/latest/tutorials/GraphiteAndMetrics.html

data/cap-uwsgi.gemspec

@@ -10,12 +10,12 @@ Gem::Specification.new do |spec|
   spec.email = ['cao7113@hotmail.com']
   spec.description = %q{uWSGI integration for Capistrano 3}
   spec.summary = %q{uWSGI integration for Capistrano 3}
-  spec.homepage = 'http://shareup.me'
+  spec.homepage = 'http://github.com/cao7113/cap-uwsgi'
   spec.license = 'MIT'
 
-  spec.files = `git ls-files`.split($/)
+  spec.files = `git ls-files --exclude doc`.split($/)
   spec.require_paths = ['lib']
 
   spec.add_dependency 'capistrano', '~> 3.0'
-
+  spec.add_development_dependency 'gem-release'
 end

data/doc/conf/rack.ini

@@ -0,0 +1,7 @@
+[uwsgi]
+#socket = 127.0.0.1:3031
+http = :8080
+rack = app.ru
+processes = 2
+master = true
+stats = 127.0.0.1:9000

data/doc/conf/rails.ini

@@ -0,0 +1,14 @@
+[uwsgi]
+#socket = 127.0.0.1:3081
+socket = /tmp/railsup.sock
+#socket = :8090
+#http = :3081
+rack = config.ru
+master = true
+#processes = 2
+# starting from 4.0, Rails support multiple threads(only for ruby2.0)
+#rbthreads = 4 
+# lazy-apps = true
+chdir = /home/cao/dev/railsup
+env = RAILS_ENV=production
+chmod-socket = 666

data/doc/conf/sinatra.ini

@@ -0,0 +1,7 @@
+[uwsgi]
+#socket = 127.0.0.1:3031
+http = :8081
+rack = sinatra.ru
+processes = 2
+master = true
+lazy-apps = true

data/doc/options.md

@@ -0,0 +1,17 @@
+# Useful uWSGI options references
+
+## Common
+
+* processes  
+* master
+* http
+* http-socket
+
+## Upsart init job
+
+* die-on-term
+
+## Ruby/Rack apps
+
+* http-modifier1 = 7
+* rack = app.ru

data/doc/upstart.md

@@ -0,0 +1,22 @@
+Ref: http://uwsgi-docs.readthedocs.org/en/latest/Upstart.html
+
+## About --die-on-term
+
+By default uWSGI maps the SIGTERM signal to 'a brutal reload procedure'
+
+However, Upstart uses SIGTERM to completely shutdown processes. die-on-term inverts the meanings of SIGTERM and SIGQUIT to uWSGI.
+
+
+## Socket activation(Ubuntu12.04+)
+
+let processes start when connections are made to specific sockets.
+
+So can use this feature to start uWSGI only when a client(or the webserver) first connects to it.
+
+# simple uWSGI script
+
+description "uwsgi tiny instance"
+start on socket PROTO=inet PORT=3031
+stop on runlevel [06]
+
+exec uwsgi --master --processes 4 --die-on-term --wsgi-file /var/www/myapp.wsgi

data/lib/capistrano/tasks/emperor.cap

@@ -61,6 +61,12 @@ namespace :uwsgi do
       end
     end
 
+    desc 'Setup this app into to emperor'
+    task :setup do
+      invoke "uwsgi:emperor:add"
+      invoke "uwsgi:nginx:setup"
+    end
+
     desc 'Add current project to the emperor'
     task :add do
       on roles(fetch(:uwsgi_role)), in: :sequence, wait: 1 do |role|
@@ -74,6 +80,7 @@ namespace :uwsgi do
       on roles(fetch(:uwsgi_role)) do
         sudo "rm -f '#{emperor_app_conf}'"
       end
+      invoke "uwsgi:nginx:deconf"
     end
 
     desc 'Touch current project for reload'

data/lib/capistrano/tasks/nginx.cap

@@ -6,12 +6,22 @@ end
 
 namespace :uwsgi do
   namespace :nginx do
+
+    desc "Setup nginx for this app" 
+    task :setup do
+      invoke "uwsgi:nginx:conf"
+      on roles(fetch(:uwsgi_role)) do |role|
+        sudo "service nginx reload"
+      end
+    end
+
     desc 'Config uwsgi nginx service'
     task :conf do
       on roles(fetch(:uwsgi_role)) do |role|
         @role = role
         template_uwsgi 'uwsgi_nginx.conf', "#{fetch(:tmp_dir)}/nginx.conf", @role
         sudo "mv -b #{fetch(:tmp_dir)}/nginx.conf #{uwsgi_nginx_app_conf}"
+        #sudo "service nginx reload"
       end
     end
 
@@ -20,6 +30,7 @@ namespace :uwsgi do
       on roles(fetch(:uwsgi_role)) do |role|
         @role = role
         sudo "rm -f #{uwsgi_nginx_app_conf}"
+        sudo "service nginx reload"
       end
     end
 

data/lib/capistrano/tasks/uwsgi.cap

@@ -32,7 +32,7 @@ namespace :uwsgi do
       @role = role
       if test "! gem query -in uwsgi >/dev/null"
         sudo "apt-get -y install libssl-dev libpcre3-dev"
-        execute "gem install uwsgi"
+        execute "gem install uwsgi -V"
       end
     end
   end

data/lib/capistrano/uwsgi/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Uwsgi
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/sh/init-emperor

@@ -0,0 +1,44 @@
+#!/usr/bin/env bash 
+#Usage: [APP_USER=xxx] [CONF_DIR=xxx] $0
+
+set -e 
+
+app_user=${APP_USER:-$USER}
+
+root_dir=$(dirname $0)
+PATH=$root_dir:$PATH install
+
+#mk conf dir
+conf_dir=${CONF_DIR:-/etc/uwsgi}
+if [ -d $conf_dir ];then
+  echo Has found $conf_dir 
+else
+  sudo mkdir $conf_dir
+  sudo chown -R $app_user:$app_user $conf_dir
+  echo Mkdir $conf_dir
+fi
+
+#install emperor init conf
+if which rbenv &>/dev/null;then
+  bin_uwsgi=`rbenv which uwsgi`
+else
+  bin_uwsgi=`which uwsgi`
+fi
+
+tmpfile=/tmp/uwsgi-emperor.conf
+dest=/etc/init/emperor.conf
+cat <<-Conf >$tmpfile
+#Emperor uWSGI script
+#Generated at `date`
+
+description "uWSGI Emperor Job"
+start on runlevel [2345]
+stop on runlevel [06]
+
+setuid $app_user
+setgid $app_user
+
+exec $bin_uwsgi --master --die-on-term --emperor $conf_dir
+Conf
+sudo cp -b $tmpfile $dest
+echo Has configured uWSGI emperor to $dest

data/sh/install

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash 
+
+which gem &>/dev/null || { echo No ruby env && exit 1;}
+gem query -in uwsgi >/dev/null && echo "Has installed uwsgi gem" && exit 
+
+echo Ref: http://uwsgi-docs.readthedocs.org/en/latest/RackQuickstart.html#automatically-starting-uwsgi-on-boot 
+echo Installing uwsgi gem for rack app
+sudo apt-get -y install libssl-dev libpcre3-dev
+gem install uwsgi
+echo Installed uwsgi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cap-uwsgi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - cao7113
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  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: uWSGI integration for Capistrano 3
 email:
 - cao7113@hotmail.com
@@ -37,18 +51,26 @@ files:
 - Rakefile
 - Readme.md
 - cap-uwsgi.gemspec
+- doc/conf/rack.ini
+- doc/conf/rails.ini
+- doc/conf/sinatra.ini
+- doc/options.md
+- doc/upstart.md
 - lib/cap-uwsgi.rb
 - lib/capistrano/tasks/emperor.cap
 - lib/capistrano/tasks/nginx.cap
 - lib/capistrano/tasks/uwsgi.cap
 - lib/capistrano/templates/uwsgi.ini.erb
+- lib/capistrano/templates/uwsgi.ini.skel.erb
 - lib/capistrano/templates/uwsgi_emperor.conf.erb
 - lib/capistrano/templates/uwsgi_nginx.conf.erb
 - lib/capistrano/uwsgi.rb
 - lib/capistrano/uwsgi/emperor.rb
 - lib/capistrano/uwsgi/nginx.rb
 - lib/capistrano/uwsgi/version.rb
-homepage: http://shareup.me
+- sh/init-emperor
+- sh/install
+homepage: http://github.com/cao7113/cap-uwsgi
 licenses:
 - MIT
 metadata: {}