rubber 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab6253fd1d0b38c978eda0a0dc6ca62262284cb6
-  data.tar.gz: d64c12b608be9a43292bace407970d31a2d7f0cf
+  metadata.gz: 8744439407fab692486f20a294c52a5c9205497e
+  data.tar.gz: 0786a0389c092de1defec7d51955e33e70380d9f
 SHA512:
-  metadata.gz: 0037e0e29c1b5a408971a1ba2b2095135e34881fcac4d26e6ed100b27211ec1e3db324f52526e29b1aa2a4b14ff0a31c3f381897340b6cf41414eaa92eb4c6d0
-  data.tar.gz: 3c60ffe2b978abda2f0626770776a68e412fe695eee2b5221d0585131998a74e6973a1a35061654a599c44389d272b11dab769de128906d30623ca3fc85da0cd
+  metadata.gz: fdde13fda5fd4795b06f60941e5e4bef3177d21c171a0d1158c70743c47da90f3c368584bf87cf37f2ed511962671cc95a488cc6f9ee6ee0cd0d9113c70d096a
+  data.tar.gz: 7f6c872ddaf88857d52e543ae6b90972dc6027201e24111d7e46f84d98374e0d26234481ece2a903b3023037446412f3c23533244f26928a8252f51530b9fe6b

data/.travis.yml

@@ -51,4 +51,4 @@ env:
     - JAVA_OPTS="-server -Djruby.cext.enabled=false -Djruby.compile.invokedynamic=false"
 
 notifications:
-  irc: "irc.freenode.net#rubberec2"
+  irc: "irc.freenode.net#rubber"

data/CHANGELOG

@@ -1,3 +1,32 @@
+2.10.0 (06/17/2014)
+
+Improvements:
+============
+
+[delayed_job] Added :kill and :status tasks. <52b593e>
+[delayed_job] Run in bundle exec context. <52b593e>
+[delayed_job] Move monit-delayed_job.conf inside the monit vulcanizer, as is the standard for all other templates. <52b593e>
+[delayed_job] Added PID file control. <52b593e>
+[delayed_job] Monit now has a 10-minute timeout because the PID file being monitored is not generated until after delayed_job daemonizes. <52b593e>
+[graylog] Upgraded to graylog 0.2.2. <51d9b26, 30fbbbc, fb0cff8, 8a72986, 0785b66>
+[graylog] Added a tools proxy for the graylog server API browser. <899555a>
+[graylog] Configured the mail transport. <686ce6b>
+[passenger_nginx] Install Passenger/Nginx from packages instead of building by hand. <103feee, 0c6eb6a, 499c08c, 9a88ffe>
+[passenger_nginx] Remove unneeded deploy.task blocks. <1b9b252>
+[passenger_nginx] Removed munin passenger plugins. <a91f837>
+[unicorn] Standardized Rake names with init script names (use terms "upgrade" and "kill"). <4c616ba>
+[unicorn] Increased Unicorn upgrade timeout to 10 mins. <4c616ba>
+[unicorn] Clarified log messages. <4c616ba>
+[unicorn] Allow setting PID file and number of workers from Rubber config. <4c616ba>
+
+Bug Fixes:
+=========
+
+[core] Fixed template calls to rubber.run_config (a regression introduced in 2.9.0). <66310a5>
+[graylog]  	Prevent creating the same graylog inputs twice. <ad8a177>
+[unicorn] Fixed unicorn init script. <4c616ba>
+
+
 2.9.0 (06/02/2014)
 
 New Features:

data/lib/rubber/recipes/rubber/deploy.rb

@@ -108,12 +108,17 @@ namespace :rubber do
     end
   end
 
-  def run_config
+  def run_config(options={})
+    path = options.delete(:deploy_path) || config_path
+    no_post = options[:no_post] || ENV['NO_POST']
+    force = options[:force] || ENV['FORCE']
+    file = options[:file] || ENV['FILE']
+
     opts = ""
-    opts += " --no_post" if ENV['NO_POST']
-    opts += " --force"   if ENV['FORCE']
-    opts += " --file=\"#{ENV['FILE']}\"" if ENV['FILE']
-    rsudo "cd #{config_path} && RUBBER_ENV=#{Rubber.env} RAILS_ENV=#{Rubber.env} ./script/rubber config #{opts}"
+    opts += " --no_post" if no_post
+    opts += " --force"   if force
+    opts += " --file=\"#{file}\"" if file
+    rsudo "cd #{path} && RUBBER_ENV=#{Rubber.env} RAILS_ENV=#{Rubber.env} ./script/rubber config #{opts}"
   end
 
   def config_path

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '2.9.0'.freeze
+  VERSION = '2.10.0'.freeze
 end

data/templates/base/config/rubber/deploy-setup.rb

@@ -54,6 +54,8 @@ namespace :rubber do
 
         echo "export RUBYOPT=rubygems\nexport PATH=#{rubber_env.ruby_path}/bin:$PATH" > /etc/profile.d/ruby.sh
         echo "--- \ngem: --no-ri --no-rdoc" > /etc/gemrc
+        update-alternatives --install /usr/bin/ruby ruby #{rubber_env.ruby_path}/bin/ruby 100
+        update-alternatives --set ruby #{rubber_env.ruby_path}/bin/ruby
       fi
       ENDSCRIPT
     end

data/templates/base/config/rubber/rubber.yml

@@ -230,15 +230,18 @@ roles:
     assigned_security_groups: [web_tools]
 
 # OPTIONAL: Automatically create security groups for each host and role
-# EC2 doesn't allow one to change what groups an instance belongs to after
-# creation, so its good to have some empty ones predefined.
-auto_security_groups: true
+# EC2 Classic doesn't allow one to change what groups an instance belongs to after
+# creation, so it's good to have some empty ones predefined.  EC2 with VPC, however,
+# does allow changing security groups after instance creation and allows far fewer
+# security groups per instance, so you shouldn't enable this setting if using VPC.
+auto_security_groups: false
 
 # OPTIONAL: Automatically isolate security groups for each appname/environment
 # by mangling their names to be appname_env_groupname
 # This makes it safer to have staging and production coexist on the same EC2
-# account, or even multiple apps
-isolate_security_groups: true
+# account, or even multiple apps.  NB: due to the security group limits per instance
+# in EC2 with VPCs, this option should only be enabled if you're using EC2 Classic.
+isolate_security_groups: false
 
 # OPTIONAL: Prompts one to sync security group rules when the ones in amazon
 # differ from those in rubber

data/templates/delayed_job/config/rubber/deploy-delayed_job.rb

@@ -1,39 +1,50 @@
 namespace :rubber do
- 
+
   namespace :delayed_job do
-    
+
     rubber.allow_optional_tasks(self)
-    
+
     after "deploy:stop",    "rubber:delayed_job:stop"
     after "deploy:start",   "rubber:delayed_job:start"
     after "deploy:restart", "rubber:delayed_job:restart"
-    
+
     def args
-      rubber_env.delayed_job_args || "-n #{rubber_env.num_delayed_job_workers}"
+      rubber_env.delayed_job_args || "-n #{rubber_env.num_delayed_job_workers} --pid-dir=#{rubber_env.delayed_job_pid_dir}"
     end
 
-    def script_location
-      bin_location = "bin/delayed_job"
-      script_location = "script/delayed_job"
+    def script_path
+      bin_path = "bin/delayed_job"
+      script_path = "script/delayed_job"
 
-      File.exists?(bin_location) ? bin_location : script_location
+      File.exists?(bin_path) ? bin_path : script_path
     end
- 
+
     desc "Stop the delayed_job process"
     task :stop, :roles => :delayed_job do
-      rsudo "cd #{current_path} && RAILS_ENV=#{Rubber.env} #{self.script_location} stop #{self.args}", :as => rubber_env.app_user
+      rsudo "cd #{current_path} && RAILS_ENV=#{Rubber.env} bundle exec #{self.script_path} stop #{self.args}", :as => rubber_env.app_user
     end
- 
+
     desc "Start the delayed_job process"
     task :start, :roles => :delayed_job do
-      rsudo "cd #{current_path} && RAILS_ENV=#{Rubber.env} #{self.script_location} start #{self.args}", :as => rubber_env.app_user
+      rsudo "cd #{current_path} && RAILS_ENV=#{Rubber.env} bundle exec #{self.script_path} start #{self.args}", :as => rubber_env.app_user
     end
- 
+
     desc "Restart the delayed_job process"
     task :restart, :roles => :delayed_job do
-      rsudo "cd #{current_path} && RAILS_ENV=#{Rubber.env} #{self.script_location} restart #{self.args}", :as => rubber_env.app_user
+      rsudo "cd #{current_path} && RAILS_ENV=#{Rubber.env} bundle exec #{self.script_path} restart #{self.args}", :as => rubber_env.app_user
+    end
+
+    desc "Forcefully kills the delayed_job process"
+    task :kill, :roles => :delayed_job do
+      rsudo "pkill -9 -f [d]elayed_job || true"
+      rsudo "rm -r -f #{rubber_env.delayed_job_pid_dir}/delayed_job.*"
     end
- 
+
+    desc "Display status of the delayed_job process"
+    task :status, :roles => :delayed_job do
+      rsudo 'ps -eopid,user,cmd | grep [d]elayed_job || true'
+    end
+
     desc "Live tail of delayed_job log files for all machines"
     task :tail_logs, :roles => :delayed_job do
       last_host = ""

data/templates/delayed_job/config/rubber/rubber-delayed_job.yml

@@ -1 +1,2 @@
 num_delayed_job_workers: 1
+delayed_job_pid_dir: "/var/run"

data/templates/graylog/config/rubber/deploy-graylog.rb

@@ -40,6 +40,22 @@ namespace :rubber do
         end
       end
 
+      after "rubber:graylog:server:bootstrap", "rubber:graylog:server:create_inputs"
+
+      task :create_inputs, :roles => :graylog_web do
+        rubber.sudo_script 'create_inputs', <<-ENDSCRIPT
+          # Only create inputs if the system has 0 inputs.  It's a bit of a rough hack, but graylog currently (v0.20.2)
+          # doesn't prevent the creation of duplicate conflicting inputs.
+          if ! curl -s --user #{rubber_env.graylog_web_username}:#{rubber_env.graylog_web_password} -XGET http://localhost:12900/system/inputs | grep "GELFUDPInput" &> /dev/null; then
+            curl --user #{rubber_env.graylog_web_username}:#{rubber_env.graylog_web_password} -XPOST http://localhost:12900/system/inputs -H "Content-Type: application/json" -d '{"type": "org.graylog2.inputs.gelf.udp.GELFUDPInput", "creator_user_id": "admin", "title": "gelf-udp", "global": true, "configuration": { "port": #{rubber_env.graylog_server_port}, "bind_address": "0.0.0.0" } }'
+          fi
+
+          if ! curl -s --user #{rubber_env.graylog_web_username}:#{rubber_env.graylog_web_password} -XGET http://localhost:12900/system/inputs | grep "SyslogUDPInput" &> /dev/null; then
+            curl --user #{rubber_env.graylog_web_username}:#{rubber_env.graylog_web_password} -XPOST http://localhost:12900/system/inputs -H "Content-Type: application/json" -d '{"type": "org.graylog2.inputs.syslog.udp.SyslogUDPInput", "creator_user_id": "admin", "title": "syslog-udp", "global": true, "configuration": { "port": #{rubber_env.graylog_server_syslog_port}, "bind_address": "0.0.0.0" } }'
+          fi
+        ENDSCRIPT
+      end
+
       desc "Stops the graylog server"
       task :stop, :roles => :graylog_server, :on_error => :continue do
         rsudo "service graylog-server stop || true"
@@ -84,18 +100,10 @@ namespace :rubber do
           rubber.run_config(:file => "role/graylog_web/", :force => true, :deploy_path => release_path)
 
           restart
+          sleep 5 # Give graylog-web a bit of time to start up.
         end
       end
 
-      after "rubber:graylog:web:bootstrap", "rubber:graylog:web:create_inputs"
-
-      task :create_inputs, :roles => :graylog_web do
-        rubber.sudo_script 'create_inputs', <<-ENDSCRIPT
-          curl --user #{rubber_env.graylog_web_username}:#{rubber_env.graylog_web_password} -XPOST http://localhost:12900/system/inputs -H "Content-Type: application/json" -d '{"type": "org.graylog2.inputs.gelf.udp.GELFUDPInput", "creator_user_id": "admin", "title": "gelf-udp", "global": true, "configuration": { "port": #{rubber_env.graylog_server_port}, "bind_address": "0.0.0.0" } }'
-          curl --user #{rubber_env.graylog_web_username}:#{rubber_env.graylog_web_password} -XPOST http://localhost:12900/system/inputs -H "Content-Type: application/json" -d '{"type": "org.graylog2.inputs.syslog.udp.SyslogUDPInput", "creator_user_id": "admin", "title": "syslog-udp", "global": true, "configuration": { "port": #{rubber_env.graylog_server_syslog_port}, "bind_address": "0.0.0.0" } }'
-        ENDSCRIPT
-      end
-
       desc "Stops the graylog web"
       task :stop, :roles => :graylog_web, :on_error => :continue do
         rsudo "service graylog-web stop || true"

data/templates/graylog/config/rubber/role/graylog_server/graylog2.conf

@@ -1,5 +1,6 @@
 <%
   @path = "/etc/graylog2.conf"
+  @delayed_post = "service graylog-server restart"
 
   require 'digest/sha2'
   root_password_sha2 = (Digest::SHA2.new << rubber_env.graylog_web_password).to_s
@@ -23,6 +24,8 @@ root_username = <%= rubber_env.graylog_web_username %>
 
 # You MUST specify a hash password for the root user (which you only need to initially set up the
 # system and in case you lose connectivity to your authentication backend)
+# This password cannot be changed using the API or via the web interface. If you need to change it,
+# modify it in this file.
 # Create one by using for example: echo -n yourpassword | shasum -a 256
 # and put the resulting hash value into the following line
 root_password_sha2 = <%= root_password_sha2 %>
@@ -38,6 +41,15 @@ rest_listen_uri = http://<%= rubber_instances[rubber_env.host].internal_ip %>:12
 # address. (see rest_listen_uri)
 rest_transport_uri = http://<%= rubber_instances[rubber_env.host].internal_ip %>:12900/
 
+# Enable CORS headers for REST api. This is necessary for JS-clients accessing the server directly.
+# If these are disabled, modern browsers will not be able to retrieve resources from the server.
+# This is disabled by default. Uncomment the next line to enable it.
+#rest_enable_cors = true
+
+# Enable GZIP support for REST api. This compresses API responses and therefore helps to reduce
+# overall round trip times. This is disabled by default. Uncomment the next line to enable it.
+#rest_enable_gzip = true
+
 # Embedded elasticsearch configuration file
 # pay attention to the working directory of the server, maybe use an absolute path here
 elasticsearch_config_file = /etc/graylog2-elasticsearch.yml
@@ -60,6 +72,14 @@ elasticsearch_replicas = 0
 
 elasticsearch_index_prefix = graylog2
 
+# Do you want to allow searches with leading wildcards? This can be extremely resource hungry and should only
+# be enabled with care. See also: http://support.torch.sh/help/kb/graylog2-web-interface/the-search-bar-explained
+allow_leading_wildcard_searches = false
+
+# Do you want to allow searches to be highlighted? Depending on the size of your messages this can be memory hungry and
+# should only be enabled after making sure your elasticsearch cluster has enough memory.
+allow_highlighting = false
+
 # settings to be passed to elasticsearch's client (overriding those in the provided elasticsearch_config_file)
 # all these
 # this must be the same as for your elasticsearch cluster
@@ -80,6 +100,13 @@ elasticsearch_node_name = <%= rubber_env.host %>
 elasticsearch_discovery_zen_ping_multicast_enabled = false
 elasticsearch_discovery_zen_ping_unicast_hosts = <%= es_servers %>
 
+# the following settings allow to change the bind addresses for the elasticsearch client in graylog2
+# these settings are empty by default, letting elasticsearch choose automatically,
+# override them here or in the 'elasticsearch_config_file' if you need to bind to a special address
+# refer to http://www.elasticsearch.org/guide/en/elasticsearch/reference/0.90/modules-network.html for special values here
+# elasticsearch_network_host =
+# elasticsearch_network_bind_host =
+# elasticsearch_network_publish_host =
 
 # Analyzer (tokenizer) to use for message and full_message field. The "standard" filter usually is a good idea.
 # All supported analyzers are: standard, simple, whitespace, stop, keyword, pattern, language, snowball, custom
@@ -117,6 +144,18 @@ processor_wait_strategy = blocking
 # Must be a power of 2. (512, 1024, 2048, ...)
 ring_size = 1024
 
+# EXPERIMENTAL: Dead Letters
+# Every failed indexing attempt is logged by default and made visible in the web-interface. You can enable
+# the experimental dead letters feature to write every message that was not successfully indexed into the
+# MongoDB "dead_letters" collection to make sure that you never lose a message. The actual writing of dead
+# letter should work fine already but it is not heavily tested yet and will get more features in future
+# releases.
+dead_letters_enabled = false
+
+# How many seconds to wait between marking node as DEAD for possible load balancers and starting the actual
+# shutdown process. Set to 0 if you have no status checking load balancers in front.
+lb_recognition_period_seconds = 3
+
 # MongoDB Configuration
 mongodb_useauth = false
 #mongodb_user = grayloguser
@@ -134,48 +173,28 @@ mongodb_max_connections = 100
 # http://api.mongodb.org/java/current/com/mongodb/MongoOptions.html#threadsAllowedToBlockForConnectionMultiplier
 mongodb_threads_allowed_to_block_multiplier = 5
 
-
 # Drools Rule File (Use to rewrite incoming log messages)
 # See: http://support.torch.sh/help/kb/graylog2-server/custom-message-rewritingprocessing
 # rules_file = /etc/graylog2.drl
 
 # Email transport
-transport_email_enabled = false
+transport_email_enabled = true
 transport_email_protocol = smtp
-transport_email_hostname = mail.example.com
-transport_email_port = 587
-transport_email_use_auth = true
-transport_email_use_tls = true
+transport_email_hostname = localhost
+transport_email_port = 25
+transport_email_use_auth = false
+transport_email_use_tls = false
+transport_email_use_ssl = false
 transport_email_auth_username = you@example.com
 transport_email_auth_password = secret
-transport_email_subject_prefix = [graylog2]
-transport_email_from_email = graylog2@example.com
+transport_email_subject_prefix = <%= Rubber.env == 'production' ? '[graylog2]' : "[graylog2-#{Rubber.env}]" %>
+transport_email_from_email = <%= Rubber.env == 'production' ? 'graylog' : "graylog-#{Rubber.env}" %>@<%= rubber_env.domain %>
 transport_email_from_name = Graylog2
-transport_email_web_interface_url = http://your-graylog2.example.org
-
-# Jabber/XMPP transport
-transport_jabber_enabled = false
-transport_jabber_hostname = jabber.example.com
-transport_jabber_port = 5222
-transport_jabber_use_sasl_auth = true
-transport_jabber_allow_selfsigned_certs = false
-transport_jabber_auth_username = your_user
-transport_jabber_auth_password = secret
-transport_jabber_message_prefix = [graylog2]
-
-# Additional modules
-# Graphite
-#enable_graphite_output = false
-#graphite_carbon_host = 127.0.0.1
-#graphite_carbon_tcp_port = 2003
-#graphite_prefix = logs
-
-# Librato Metrics (http://support.torch.sh/help/kb/graylog2-server/using-librato-metrics-with-graylog2)
-#enable_libratometrics_output = false
-#enable_libratometrics_system_metrics = false
-#libratometrics_api_user = you@example.com
-#libratometrics_api_token = abcdefg12345
-#libratometrics_prefix = gl2-
-#libratometrics_interval = 60
-#libratometrics_stream_filter =
-#libratometrics_host_filter =
+
+# Specify and uncomment this if you want to include links to the stream in your stream alert mails.
+# This should define the fully qualified base url to your web interface exactly the same way as it is accessed by your users.
+#
+transport_email_web_interface_url = https://graylog-<%= rubber_env.full_host %>:<%= rubber_env.web_tools_ssl_port %>/
+
+# HTTP proxy for outgoing HTTP calls
+#http_proxy_uri = 

data/templates/graylog/config/rubber/role/graylog_web/graylog2-web-interface.conf

@@ -6,6 +6,9 @@
 # graylog2-server REST URIs (one or more, comma separated) For example: "http://127.0.0.1:12900/,http://127.0.0.1:12910/"
 graylog2-server.uris="<%= graylog_server_uris %>"
 
+# Learn how to configure custom logging in the documentation:
+#    http://support.torch.sh/help/kb/graylog2-web-interface/configuring-web-interface-logging
+
 # Secret key
 # ~~~~~
 # The secret key is used to secure cryptographics functions. Set this to a long and randomly generated string.
@@ -17,3 +20,15 @@ application.secret="<%= rubber_env.graylog_web_secret %>"
 # Graylog2 stores all timestamps in UTC. To properly display times, set the default timezone of the interface.
 # If you leave this out, Graylog2 will pick your system default as the timezone. Usually you will want to configure it explicitly.
 timezone="<%= rubber_env.timezone %>"
+
+# Message field limit
+# Your web interface can cause high load in your browser when you have a lot of different message fields. The default
+# limit of message fields is 100. Set it to 0 if you always want to get all fields. They are for example used in the
+# search result sidebar or for autocompletion of field names.
+field_list_limit=100
+
+# Use this to run Graylog2 with a path prefix
+#application.context=/graylog2
+
+# You usually do not want to change this.
+application.global=lib.Global

data/templates/graylog/config/rubber/rubber-graylog.yml

@@ -1,11 +1,11 @@
-graylog_server_version: "0.20.1"
+graylog_server_version: "0.20.2"
 graylog_server_prefix: "/usr/local"
 graylog_server_dir: "#{graylog_server_prefix}/graylog2-server-#{graylog_server_version}"
 graylog_server_pid_file: "/var/run/graylog-server.pid"
 graylog_server_port: 12201
 graylog_server_syslog_port: 12514
 
-graylog_web_version: "0.20.1"
+graylog_web_version: "0.20.2"
 graylog_web_prefix: "/usr/local"
 graylog_web_dir: "#{graylog_web_prefix}/graylog2-web-interface-#{graylog_web_version}"
 graylog_web_pid_file: "/var/run/graylog-web.pid"
@@ -22,6 +22,10 @@ web_tools_proxies:
     role: graylog_web
     port: "#{graylog_web_port}"
     path: /
+  graylog_server_api_browser:
+    role: graylog_server
+    port: 12900
+    path: /api-browser/
 
 role_dependencies:
   graylog_server: [graylog_mongodb, graylog_elasticsearch]

data/templates/monit/config/rubber/role/delayed_job/monit-delayed_job.conf

@@ -0,0 +1,24 @@
+<%
+  @path = '/etc/monit/monit.d/monit-delayed_job.conf'
+  current_path = "/mnt/#{rubber_env.app_name}-#{Rubber.env}/current"
+
+  bin_path = "bin/delayed_job"
+  script_path = "script/delayed_job"
+  script_path = File.exists?(bin_path) ? bin_path : script_path
+%>
+
+<% if rubber_env.num_delayed_job_workers == 1 %>
+check process delayed_job
+  with pidfile <%= rubber_env.delayed_job_pid_dir %>/delayed_job.pid
+  start program = "/usr/bin/sudo -H -u #{rubber_env.app_user} /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> start --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
+  stop program = "/usr/bin/sudo -H -u #{rubber_env.app_user} /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> stop --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
+<% else %>
+<% rubber_env.num_delayed_job_workers.times do |id| %>
+check process delayed_job_<%= id %>
+  with pidfile <%= rubber_env.delayed_job_pid_dir %>/delayed_job.<%= id %>.pid
+  start program = "/usr/bin/sudo -H -u #{rubber_env.app_user} /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> start -i <%= id %> --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
+  stop program = "/usr/bin/sudo -H -u #{rubber_env.app_user} /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> stop -i <%= id %> --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
+  group delayed_job
+<% end %>
+<% end %>
+  if 5 restarts within 5 cycles then timeout

data/templates/monit/config/rubber/role/unicorn/monit-unicorn.conf

@@ -1,7 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-unicorn.conf'
 %>
-check process unicorn with pidfile /var/run/unicorn.pid
+check process unicorn with pidfile <%= rubber_env.unicorn_pid_file %>
   group unicorn-<%= Rubber.env %>
   start program = "/usr/bin/env service unicorn start"
   stop program = "/usr/bin/env service unicorn stop"

data/templates/passenger_nginx/config/rubber/deploy-passenger_nginx.rb

@@ -4,34 +4,14 @@ namespace :rubber do
   
     rubber.allow_optional_tasks(self)
   
-    after "rubber:install_gems", "rubber:passenger_nginx:custom_install"
-    
-    task :custom_install, :roles => :passenger_nginx do
-      rubber.sudo_script 'install_passenger_nginx', <<-ENDSCRIPT
-        # Check if there is an nginx with the required version and passenger built in.
-        if [ -x /usr/sbin/nginx ]
-          then echo 'Found nginx on system'
-          if [ $(find #{rubber_env.ruby_path} -regex .*passenger-#{rubber_env.passenger_version}.*PassengerWatchdog | wc -l) -gt 0 ]
-            then echo 'Found passenger-nginx-module on system'
-            pax=$(/usr/sbin/nginx -V 2>&1 | awk '/nginx\\/#{rubber_env.nginx_version}/{a++}/passenger-#{rubber_env.passenger_version}/{b++} END {print a&&b}')
-            if [ $pax -eq 1 ]
-              then echo 'Nginx/Passenger version matches'
-              exit 0
-            fi
-          fi
-        fi
-        # Lets install
-        echo 'Installing / Upgrading nginx #{rubber_env.nginx_version}'
-        TMPDIR=`mktemp -d` || exit 1
-        cd $TMPDIR
-        echo 'Downloading'
-        wget -qN http://nginx.org/download/nginx-#{rubber_env.nginx_version}.tar.gz
-        echo 'Unpacking'
-        tar xf nginx-#{rubber_env.nginx_version}.tar.gz
-        passenger-install-nginx-module --auto --prefix=/opt/nginx --nginx-source-dir=$TMPDIR/nginx-#{rubber_env.nginx_version} --extra-configure-flags="--conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log --lock-path=/var/lock/nginx.lock --pid-path=/var/run/nginx.pid --sbin-path=/usr/sbin/nginx --with-http_gzip_static_module"
+    before "rubber:install_packages", "rubber:passenger_nginx:setup_apt_sources"
+    task :setup_apt_sources do
+      rubber.sudo_script 'configure_passenger_nginx_repository', <<-ENDSCRIPT
+        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 561F9B9CAC40B2F7
+        add-apt-repository -y https://oss-binaries.phusionpassenger.com/apt/passenger
       ENDSCRIPT
     end
-
+  
     after "rubber:setup_app_permissions", "rubber:passenger_nginx:setup_passenger_permissions"
 
     task :setup_passenger_permissions, :roles => :passenger_nginx do
@@ -71,18 +51,5 @@ namespace :rubber do
       serial_reload
     end
     
-    
-    deploy.task :restart, :roles => :passenger_nginx do
-    end
-    
-    deploy.task :reload, :roles => :passenger_nginx do
-    end
-    
-    deploy.task :stop, :roles => :passenger_nginx do
-    end
-    
-    deploy.task :start, :roles => :passenger_nginx do
-    end
-    
   end
 end

data/templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx.conf

@@ -9,6 +9,9 @@ worker_rlimit_nofile 10240;
 
 pid /var/run/nginx.pid;
 
+# Preserve the system path (needed for things like imagemagick + ghostscript)
+env PATH;
+
 events
 {
   worker_connections 8192;
@@ -44,20 +47,19 @@ http
   error_log         <%= rubber_env.nginx_log_dir %>/error.log notice;
   access_log        <%= rubber_env.nginx_log_dir %>/access.log main;
 
-	passenger_root <%= rubber_env.passenger_root %>;
-	passenger_ruby <%= rubber_env.passenger_ruby %>;
+  passenger_root <%= rubber_env.passenger_root %>;
+  passenger_ruby <%= rubber_env.passenger_ruby %>;
 
-	passenger_max_pool_size <%= rubber_env.max_app_connections %>;
-	passenger_min_instances <%= rubber_env.max_app_connections %>;
-	passenger_max_instances_per_app 0;
-	passenger_pool_idle_time 0;
-	rails_framework_spawner_idle_time 0;
-	rails_app_spawner_idle_time 0;
+  passenger_max_pool_size <%= rubber_env.max_app_connections %>;
+  passenger_min_instances <%= rubber_env.max_app_connections %>;
+  passenger_max_instances_per_app 0;
+  passenger_pool_idle_time 0;
+  passenger_max_preloader_idle_time 0;
   rails_env <%= Rubber.env %>;
-	passenger_friendly_error_pages <%= Rubber.env == 'production' ? 'off' : 'on' %>;
-	
-	passenger_user <%= rubber_env.app_user %>;
-	
+  passenger_friendly_error_pages <%= Rubber.env == 'production' ? 'off' : 'on' %>;
+  
+  passenger_user <%= rubber_env.app_user %>;
+  
   include /etc/nginx/rubber/passenger_nginx.conf;
   <% if rubber_instances[rubber_env.host].role_names.include?('web_tools') %> 
     include /etc/nginx/rubber/tools.conf;

data/templates/passenger_nginx/config/rubber/rubber-passenger_nginx.yml

@@ -1,13 +1,9 @@
-passenger_version: 3.0.19
-nginx_version: 1.2.8
-passenger_root: "#{`bash -l -c 'find #{ruby_path} -name passenger-#{passenger_version}'`.strip}"
+passenger_root: "/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini"
 passenger_ruby: "#{ruby_path}/bin/ruby"
-passenger_lib: "#{passenger_root}/ext/nginx"
 nginx_log_dir: /mnt/nginx/logs
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001
 max_app_connections: 20
-nginx_log_dir: /mnt/nginx/logs
 
 use_ssl_key: false
 #if you use an ssl key, put your cert and key
@@ -18,5 +14,4 @@ use_ssl_key: false
 
 roles:
   passenger_nginx:
-    packages: [libcurl4-openssl-dev, libpcre3-dev]
-    gems: [[passenger, "#{passenger_version}"]]
+    packages: [libcurl4-openssl-dev, libpcre3-dev, nginx-extras, passenger]

data/templates/unicorn/config/rubber/deploy-unicorn.rb

@@ -7,18 +7,13 @@ namespace :rubber do
 
     before "deploy:stop", "rubber:unicorn:stop"
     after "deploy:start", "rubber:unicorn:start"
-    after "deploy:restart", "rubber:unicorn:reload"
+    after "deploy:restart", "rubber:unicorn:upgrade"
 
     desc "Stops the unicorn server"
     task :stop, :roles => :unicorn do
       rsudo "service unicorn stop"
     end
 
-    desc "Forcefully kills the unicorn server"
-    task :force_stop, :roles => :unicorn do
-      rsudo "service unicorn force-stop"
-    end
-
     desc "Starts the unicorn server"
     task :start, :roles => :unicorn do
       rsudo "service unicorn start"
@@ -30,16 +25,20 @@ namespace :rubber do
     end
 
     desc "Reloads the unicorn web server"
-    task :reload, :roles => :unicorn do
+    task :upgrade, :roles => :unicorn do
       rsudo "service unicorn upgrade"
     end
 
+    desc "Forcefully kills the unicorn server"
+    task :kill, :roles => :unicorn do
+      rsudo "service unicorn kill"
+    end
 
     desc "Display status of the unicorn web server"
     task :status, :roles => :unicorn do
-      # "service unicorn status" always returns "unicorn stop/waiting"
+      rsudo "service unicorn status || true"
       rsudo "ps -eopid,user,cmd | grep [u]nicorn || true"
-      rsudo "netstat -tupan | grep unicorn || true"
+      # rsudo "netstat -tupan | grep unicorn || true"
     end
 
   end

data/templates/unicorn/config/rubber/role/unicorn/unicorn

@@ -10,9 +10,9 @@ set -e
 # since nginx and unicorn accept the same signals
 
 # Feel free to change any of the following variables for your app:
-TIMEOUT=${TIMEOUT-60}
+TIMEOUT=${TIMEOUT-600}
 APP_ROOT=<%= current_path %>
-PID=/var/run/unicorn.pid
+PID=<%= rubber_env.unicorn_pid_file %>
 CMD="<%= "bundle exec unicorn_rails -c #{current_path}/config/unicorn.rb -E #{Rubber.env} -D" %>"
 action="$1"
 set -u
@@ -38,7 +38,7 @@ stop)
   sig QUIT && exit 0
   echo >&2 "Not running"
   ;;
-force-stop)
+kill)
   sig TERM && exit 0
   echo >&2 "Not running"
   ;;
@@ -50,42 +50,52 @@ restart|reload)
 upgrade)
   if sig USR2
   then
-    printf 'Waiting for new workers'
+    printf 'Waiting for new Unicorn workers'
     n=$TIMEOUT
     while (! (test -s $PID && ps --no-headers --ppid `cat $PID` > /dev/null)) && test $n -ge 0
     do
-      printf '.' && sleep 1 && n=$(( $n - 1 ))
+      printf '.' && sleep 10 && n=$(( $n - 10 ))
     done
-    if test ! -s $old_pid
+
+    if test $n -lt 0 && (! (test -s $PID && ps --no-headers --ppid `cat $PID` > /dev/null))
     then
-      echo
-      echo >&2 'New workers failed to start; see error log'
+      echo >&2 "$PID process does not exist after $TIMEOUT seconds"
       exit 1
     fi
-    printf '\nStopping old master' && oldsig QUIT
-
-    n=$TIMEOUT
-    while test -s $old_pid && test $n -ge 0
-    do
-      printf '.' && sleep 1 && n=$(( $n - 1 ))
-    done
-    echo
+    printf '\nNew Unicorn workers started'
 
-    if test $n -lt 0 && test -s $old_pid
+    if test -s $old_pid
     then
-      echo >&2 "$old_pid still exists after $TIMEOUT seconds"
-      exit 1
+      printf '\nWaiting for old Unicorn master to stop'
+      n=$TIMEOUT
+      while test -s $old_pid && test $n -ge 0
+      do
+        printf '.' && sleep 10 && n=$(( $n - 10 ))
+      done
+      echo
+
+      if test $n -lt 0 && test -s $old_pid
+      then
+        echo >&2 "$old_pid still exists after $TIMEOUT seconds"
+        exit 1
+      fi
     fi
+
+    printf '\nOld Unicorn master stopped'
     exit 0
   fi
   echo >&2 "Couldn't upgrade, starting '$CMD' instead"
   $CMD
   ;;
+status)
+  sig 0 && echo >&2 "Running" && exit 1
+  echo >&2 "Stopped" && exit 0
+  ;;
 reopen-logs)
   sig USR1
   ;;
 *)
-  echo >&2 "Usage: $0 <start|stop|restart|upgrade|force-stop|reopen-logs>"
+  echo >&2 "Usage: $0 <start|stop|restart|upgrade|kill|status|reopen-logs>"
   exit 1
   ;;
 esac

data/templates/unicorn/config/rubber/role/unicorn/unicorn.rb

@@ -2,7 +2,7 @@
   @path = "#{Rubber.root}/config/unicorn.rb"
   current_path = "/mnt/#{rubber_env.app_name}-#{Rubber.env}/current"
 %>
-worker_processes 2
+worker_processes <%= rubber_env.unicorn_num_workers %>
 working_directory "<%= Rubber.root %>"
 
 # This loads the application in the master process before forking
@@ -17,7 +17,7 @@ timeout 30
 # We will point the upstream Nginx module to this socket later on
 listen "/var/run/unicorn.sock", :backlog => 64
 
-pid "/var/run/unicorn.pid"
+pid "<%= rubber_env.unicorn_pid_file %>"
 
 # Set the path of the log files inside the log folder of the testapp
 stderr_path "<%= Rubber.root %>/log/unicorn.stderr.log"
@@ -41,12 +41,12 @@ before_fork do |server, worker|
   # we send it a QUIT.
   #
   # Using this method we get 0 downtime deploys.
-  old_pid = "/var/run/unicorn.pid.oldbin"
+  old_pid = server.config[:pid].sub('.pid', '.pid.oldbin')
   if File.exists?(old_pid) && server.pid != old_pid
     begin
       Process.kill("QUIT", File.read(old_pid).to_i)
     rescue Errno::ENOENT, Errno::ESRCH
-      # someone else did our job for us
+      STDERR.puts "WARNING: old Unicorn process was already killed before new process forked."
     end
   end
   
@@ -74,7 +74,7 @@ after_fork do |server, worker|
     end
   rescue => e
     if RAILS_ENV == 'development'
-      STDERR.puts "couldn't change user, oh well"
+      STDERR.puts "WARNING: could not set user on Unicorn workers."
     else
       raise e
     end
@@ -84,4 +84,4 @@ after_fork do |server, worker|
   # processes
   defined?(ActiveRecord::Base) and
     ActiveRecord::Base.establish_connection
-end
+end

data/templates/unicorn/config/rubber/rubber-unicorn.yml

@@ -1,5 +1,8 @@
+unicorn_num_workers: 2
+unicorn_pid_file: /var/run/unicorn.pid
+
 role_dependencies:
   unicorn: [nginx]
 roles:
   unicorn:
-    gems: [unicorn]
+    gems: [unicorn]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -357,7 +357,6 @@ files:
 - templates/cruise/config/rubber/rubber-cruise.yml
 - templates/cruise/templates.yml
 - templates/delayed_job/config/rubber/deploy-delayed_job.rb
-- templates/delayed_job/config/rubber/role/delayed_job/monit-delayed_job.conf
 - templates/delayed_job/config/rubber/rubber-delayed_job.yml
 - templates/delayed_job/templates.yml
 - templates/discourse/config/rubber/deploy-discourse.rb
@@ -454,6 +453,7 @@ files:
 - templates/monit/config/rubber/role/apache/monit-apache.conf
 - templates/monit/config/rubber/role/cassandra/monit-cassandra.conf
 - templates/monit/config/rubber/role/couchbase/monit-couchbase.conf
+- templates/monit/config/rubber/role/delayed_job/monit-delayed_job.conf
 - templates/monit/config/rubber/role/elasticsearch/monit-elasticsearch.conf
 - templates/monit/config/rubber/role/graphite_server/monit-graphite_server.conf
 - templates/monit/config/rubber/role/graylog_server/monit-graylog_server.conf
@@ -490,9 +490,6 @@ files:
 - templates/munin/config/rubber/role/passenger/munin-passenger-memory.conf
 - templates/munin/config/rubber/role/passenger/munin-passenger-sudoers.conf
 - templates/munin/config/rubber/role/passenger/munin-passenger.conf
-- templates/munin/config/rubber/role/passenger_nginx/munin-passenger-memory.conf
-- templates/munin/config/rubber/role/passenger_nginx/munin-passenger-sudoers.conf
-- templates/munin/config/rubber/role/passenger_nginx/munin-passenger.conf
 - templates/munin/config/rubber/role/postgresql/munin-postgresql.conf
 - templates/munin/config/rubber/role/web_tools/munin-nginx.conf
 - templates/munin/config/rubber/role/web_tools/munin-plugins.conf
@@ -543,7 +540,6 @@ files:
 - templates/passenger_nginx/config/rubber/deploy-passenger_nginx.rb
 - templates/passenger_nginx/config/rubber/role/passenger_nginx/application.conf
 - templates/passenger_nginx/config/rubber/role/passenger_nginx/crontab
-- templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx
 - templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx.conf
 - templates/passenger_nginx/config/rubber/role/passenger_nginx/passenger_nginx.conf
 - templates/passenger_nginx/config/rubber/role/web_tools/nginx-tools.conf

data/templates/delayed_job/config/rubber/role/delayed_job/monit-delayed_job.conf

@@ -1,18 +0,0 @@
-<%
-  @path = '/etc/monit/monit.d/monit-delayed_job.conf'
-%>
-
-<% if rubber_env.num_delayed_job_workers == 1 %>
-check process delayed_job
-  with pidfile <%= Rubber.root %>/tmp/pids/delayed_job.pid
-  start program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> /bin/bash -l -c 'RAILS_ENV=<%= Rubber.env %> <%= Rubber.root %>/script/delayed_job start'"
-  stop program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> /bin/bash -l -c 'RAILS_ENV=<%= Rubber.env %> <%= Rubber.root %>/script/delayed_job stop'"
-<% else %>
-<% rubber_env.num_delayed_job_workers.times do |id| %>
-check process delayed_job_<%= id %>
-  with pidfile <%= Rubber.root %>/tmp/pids/delayed_job.<%= id %>.pid
-  start program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> /bin/bash -l -c 'RAILS_ENV=<%= Rubber.env %> <%= Rubber.root %>/script/delayed_job start -i <%= id %>'"
-  stop program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> /bin/bash -l -c 'RAILS_ENV=<%= Rubber.env %> <%= Rubber.root %>/script/delayed_job stop -i <%= id %>'"
-  group delayed_job
-<% end %>
-<% end %>

data/templates/munin/config/rubber/role/passenger_nginx/munin-passenger-memory.conf

@@ -1,34 +0,0 @@
-<%
-  @path = "/etc/munin/plugins/passenger_memory_status"
-  @perms = 0755
-%>#!/usr/bin/env ruby
-# put in /etc/munin/plugins and restart munin-node
-# by Dan Manges, http://www.dcmanges.com/blog/rails-application-visualization-with-munin
-# NOTE: you might need to add munin to allow passwordless sudo for passenger-memory-stats
-
-def output_config
-  puts <<-END
-graph_category App
-graph_title Passenger memory stats
-graph_vlabel megabytes
-
-memory.label memory
-END
-  exit 0
-end
-
-def output_values
-  status = `sudo <%= rubber_env.ruby_path %>/bin/passenger-memory-stats | tail -1`
-  unless $?.success?
-    $stderr.puts "failed executing passenger-memory-stats"
-    exit 1
-  end
-  status =~ /(\d+\.\d+)/
-  puts "memory.value #{$1}"
-end
-
-if ARGV[0] == "config"
-  output_config
-else
-  output_values
-end

data/templates/munin/config/rubber/role/passenger_nginx/munin-passenger-sudoers.conf

@@ -1,8 +0,0 @@
-<%
-  @path = '/etc/sudoers'
-  @additive = ["# munin passenger start", "# munin passenger end"]
-%>
-Defaults env_keep = GEM_PATH
-
-nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.ruby_path %>/bin/passenger-status
-nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.ruby_path %>/bin/passenger-memory-stats

data/templates/munin/config/rubber/role/passenger_nginx/munin-passenger.conf

@@ -1,47 +0,0 @@
-<%
-  @path = "/etc/munin/plugins/passenger_status"
-  @perms = 0755
-%>#!/usr/bin/env ruby
-
-# from http://gist.github.com/21328
-# by Dan Manges, http://www.dcmanges.com/blog/rails-application-visualization-with-munin
-
-def output_config
-  puts <<-END
-graph_category App
-graph_title passenger status
-graph_vlabel count
-
-sessions.label sessions
-max.label max processes
-running.label running processes
-active.label active processes
-END
-  exit 0
-end
-
-def output_values
-  status = `sudo <%= rubber_env.ruby_path %>/bin/passenger-status`
-  unless $?.success?
-    $stderr.puts "failed executing passenger-status"
-    exit 1
-  end
-  status =~ /max\s+=\s+(\d+)/
-  puts "max.value #{$1}"
-
-  status =~ /count\s+=\s+(\d+)/
-  puts "running.value #{$1}"
-
-  status =~ /active\s+=\s+(\d+)/
-  puts "active.value #{$1}"
-
-  total_sessions = 0
-  status.scan(/Sessions: (\d+)/).flatten.each { |count| total_sessions += count.to_i }
-  puts "sessions.value #{total_sessions}"
-end
-
-if ARGV[0] == "config"
-  output_config
-else
-  output_values
-end

data/templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx

@@ -1,101 +0,0 @@
-<%
-  @path = "/etc/init.d/nginx"
-  @perms = 0755
-  @post = "/usr/sbin/update-rc.d -f nginx defaults"
-  @backup = false
-%>#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          nginx
-# Required-Start:    $local_fs $remote_fs $network $syslog
-# Required-Stop:     $local_fs $remote_fs $network $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: starts the nginx web server
-# Description:       starts nginx using start-stop-daemon
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/sbin/nginx
-NAME=nginx
-DESC=nginx
-
-# Include nginx defaults if available
-if [ -f /etc/default/nginx ]; then
-	. /etc/default/nginx
-fi
-
-test -x $DAEMON || exit 0
-
-set -e
-
-. /lib/lsb/init-functions
-
-test_nginx_config() {
-	if $DAEMON -t $DAEMON_OPTS >/dev/null 2>&1; then
-		return 0
-	else
-		$DAEMON -t $DAEMON_OPTS
-		return $?
-	fi
-}
-
-case "$1" in
-	start)
-		echo -n "Starting $DESC: "
-		test_nginx_config
-		# Check if the ULIMIT is set in /etc/default/nginx
-		if [ -n "$ULIMIT" ]; then
-			# Set the ulimits
-			ulimit $ULIMIT
-		fi
-		start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-		    --exec $DAEMON -- $DAEMON_OPTS || true
-		echo "$NAME."
-		;;
-
-	stop)
-		echo -n "Stopping $DESC: "
-		start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-		    --exec $DAEMON || true
-		echo "$NAME."
-		;;
-
-	restart|force-reload)
-		echo -n "Restarting $DESC: "
-		start-stop-daemon --stop --quiet --pidfile \
-		    /var/run/$NAME.pid --exec $DAEMON || true
-		sleep 1
-		test_nginx_config
-		start-stop-daemon --start --quiet --pidfile \
-		    /var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS || true
-		echo "$NAME."
-		;;
-
-	reload)
-		echo -n "Reloading $DESC configuration: "
-		test_nginx_config
-		start-stop-daemon --stop --signal HUP --quiet --pidfile /var/run/$NAME.pid \
-		    --exec $DAEMON || true
-		echo "$NAME."
-		;;
-
-	configtest|testconfig)
-		echo -n "Testing $DESC configuration: "
-		if test_nginx_config; then
-			echo "$NAME."
-		else
-			exit $?
-		fi
-		;;
-
-	status)
-		status_of_proc -p /var/run/$NAME.pid "$DAEMON" nginx && exit 0 || exit $?
-		;;
-	*)
-		echo "Usage: $NAME {start|stop|restart|reload|force-reload|status|configtest}" >&2
-		exit 1
-		;;
-esac
-
-exit 0