Merge branch 'stable' into develop

Changelog.md

@@ -81,6 +81,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Add new moderator role. Moderators can view and act on reported posts [#6351](https://github.com/diaspora/diaspora/pull/6351)
 * Only post to the primary tumblr blog [#6386](https://github.com/diaspora/diaspora/pull/6386)
 * Always show public photos on profile page [#6398](https://github.com/diaspora/diaspora/pull/6398)
+* Expose Unicorn's pid option to our configuration system [#6411](https://github.com/diaspora/diaspora/pull/6411)
 
 # 0.5.3.1
 

config/defaults.yml

@@ -41,6 +41,7 @@ defaults:
   server:
     listen: '0.0.0.0:3000'
     rails_environment: 'development'
+    pid:
     stderr_log:
     stdout_log:
     unicorn_worker: 2

config/diaspora.yml.example

@@ -167,6 +167,9 @@ configuration: ## Section
     #listen: 'unix:/run/diaspora/diaspora.sock'
     #listen: '127.0.0.1:3000'
 
+    ## Set the path for the PID file of the unicorn master process (default=none)
+    #pid: '/run/diaspora/diaspora.pid'
+
     ## Rails environment (default='development').
     ## The environment in which the server should be started by default.
     ## Change this to 'production' if you wish to run a production environment.

config/unicorn.rb

@@ -4,6 +4,7 @@ port = ENV["PORT"]
 port = port && !port.empty? ? port.to_i : nil
 
 listen port || AppConfig.server.listen.get unless RACKUP[:set_listener]
+pid AppConfig.server.pid.get if AppConfig.server.pid?
 worker_processes AppConfig.server.unicorn_worker.to_i
 timeout AppConfig.server.unicorn_timeout.to_i
 stderr_path AppConfig.server.stderr_log.get if AppConfig.server.stderr_log?