Add friendly names for passenger applications

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 46ba9bdd3626b78282442fce84b4cab1de267035..c93176e2587c1a68b4644099806dc607f81bc037 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -243,7 +243,7 @@ if node[:postgresql][:clusters][:"9.5/main"]
 
       apache_site site_name do
         template "apache.rails.erb"
 
       apache_site site_name do
         template "apache.rails.erb"

-        variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base
+        variables :application_name => name, :aliases => site_aliases, :secret_key_base => secret_key_base

       end
     else
       apache_site site_name do
       end
     else
       apache_site site_name do

diff --git a/cookbooks/dev/templates/default/apache.rails.erb b/cookbooks/dev/templates/default/apache.rails.erb
index 983d1daf7dd322c0937e8c77fddf2b8579044690..c8f5f779d52d4a3e9170269a1dea3f6266b17181 100644 (file)
--- a/cookbooks/dev/templates/default/apache.rails.erb
+++ b/cookbooks/dev/templates/default/apache.rails.erb
@@ -17,6 +17,7 @@
         DocumentRoot /srv/<%= @name %>/public
 
         RailsEnv production
         DocumentRoot /srv/<%= @name %>/public
 
         RailsEnv production

+        PassengerAppGroupName <%= @application_name %>

 
         SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
 
         SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 

diff --git a/cookbooks/owl/templates/default/apache.erb b/cookbooks/owl/templates/default/apache.erb
index 94dbc3ef1fa4b1edc675d018bf4cbda55e0a2e86..d5af8e1d5581efbfac5014e44cb33982830a196f 100644 (file)
--- a/cookbooks/owl/templates/default/apache.erb
+++ b/cookbooks/owl/templates/default/apache.erb
@@ -10,6 +10,7 @@
        DocumentRoot /srv/<%= @name %>/openstreetmap-watch-list/rails/public
 
        RailsEnv production
        DocumentRoot /srv/<%= @name %>/openstreetmap-watch-list/rails/public
 
        RailsEnv production

+        PassengerAppGroupName owl

 
        SetOutputFilter DEFLATE
 
 
        SetOutputFilter DEFLATE
 

diff --git a/cookbooks/taginfo/templates/default/apache.erb b/cookbooks/taginfo/templates/default/apache.erb
index 82fef8b37f054941b214d90848ade923c61b4dbb..4965a9bc131b433218f92a7c4608c0734ba516ee 100644 (file)
--- a/cookbooks/taginfo/templates/default/apache.erb
+++ b/cookbooks/taginfo/templates/default/apache.erb
@@ -15,6 +15,7 @@
         RackEnv production
         PassengerMinInstances 10
         PassengerPreStart http://<%= @name %>/
         RackEnv production
         PassengerMinInstances 10
         PassengerPreStart http://<%= @name %>/

+        PassengerAppGroupName taginfo

 
         CacheEnable disk /api
         CacheEnable disk /embed
 
         CacheEnable disk /api
         CacheEnable disk /embed

diff --git a/cookbooks/web/templates/default/apache.backend.erb b/cookbooks/web/templates/default/apache.backend.erb
index c024090b230eb18bda5fda6306d440876112acf5..089ca1c30170c25c181af8800a8b38861fe8b093 100644 (file)
--- a/cookbooks/web/templates/default/apache.backend.erb
+++ b/cookbooks/web/templates/default/apache.backend.erb
@@ -40,6 +40,7 @@
   PassengerMinInstances 3
   PassengerMaxRequests 500
   PassengerPreStart https://www.openstreetmap.org/
   PassengerMinInstances 3
   PassengerMaxRequests 500
   PassengerPreStart https://www.openstreetmap.org/

+  PassengerAppGroupName rails

   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
   #
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
 
   #

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 402d4209d01f39004fa696e2f07498e9b73bfaba..d2e850fffbb1accb5304f0e7e4212c896a4f3372 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -153,6 +153,7 @@
   PassengerMaxRequests 5000
   PassengerMaxRequestQueueSize 250
   PassengerPreStart https://www.openstreetmap.org/
   PassengerMaxRequests 5000
   PassengerMaxRequestQueueSize 250
   PassengerPreStart https://www.openstreetmap.org/

+  PassengerAppGroupName rails

   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
   Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/favicons/favicon.ico
   Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers
   SetEnv SECRET_KEY_BASE <%= @secret_key_base %>
   Alias /favicon.ico <%= node[:web][:base_directory] %>/rails/app/assets/favicons/favicon.ico
   Alias /openlayers <%= node[:web][:base_directory] %>/rails/vendor/assets/openlayers