Merge branch 'optional-environment-file'

doubleotoo · Apr 5, 2012 · f3716f9 · f3716f9
2 parents 2530bc6 + d49aa04
commit f3716f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/jetty_files/jetty-init.erb b/jetty_files/jetty-init.erb
@@ -14,6 +14,10 @@ JETTY_LOGS=$WEB_ROOT/log
 # Avoid unnecessary su call if we're already the app user
 test `whoami` != <%=@settings.app_user%> && JETTY_USER=<%=@settings.app_user%>
 
+<% if @settings.environment %>
+source <%=@settings.environment%>
+<% end %>
+
 # Startup script for jetty under *nix systems (it works under NT/cygwin too).
 
 # To get the service to restart correctly on reboot, uncomment below (3 lines):

diff --git a/lib/jetpack/settings.rb b/lib/jetpack/settings.rb
@@ -24,6 +24,7 @@ def initialize(project_dir, user_defined_options)
       contents["max_concurrent_connections"] = user_defined_options["max_concurrent_connections"] || 20
       contents["ruby_version"] =  user_defined_options["ruby_version"]    || "1.8"
       contents["app_type"]     =  user_defined_options["app_type"]        || "rails"
+      contents["environment"]  =  user_defined_options["environment"]     || nil
 
       @keys = contents.keys.sort