test/stub/apache2/httpd.conf.erb in passenger-4.0.60 vs test/stub/apache2/httpd.conf.erb in passenger-5.0.0.beta1
- old
+ new
@@ -59,14 +59,16 @@
PassengerRoot "<%= @passenger_root %>"
PassengerDefaultRuby "<%= PlatformInfo.ruby_command %>"
PassengerDefaultUser <%= CONFIG['default_user'] %>
PassengerDefaultGroup <%= CONFIG['default_group'] %>
-PassengerTempDir "<%= @passenger_temp_dir %>"
+PassengerInstanceRegistryDir "<%= @passenger_temp_dir %>"
+PassengerDataBufferDir "<%= @passenger_temp_dir %>"
RailsEnv production
RackEnv production
-PassengerLogLevel 1
+PassengerLogLevel 7
+PassengerTurbocaching off
<% for line in @extra %>
<%= line %>
<% end %>
TypesConfig "<%= @server_root %>/mime.types"
@@ -91,9 +93,10 @@
<Directory />
AllowOverride all
</Directory>
+Timeout 60
ServerAdmin admin@passenger.test
ServerName passenger.test
DocumentRoot "<%= @server_root %>"
<% if PlatformInfo.httpd_version < '2.4.0' %>