@@ -33,10 +33,6 @@ <td>Run in…</td> <td>The environment you want to run the Rails application in.</td> </tr> -<tr> - <td>Allow custom rewrite rules</td> - <td>By default, Passenger uses its own rewrite rules to run Rails applications. Please note that you will have to remove or change the default <tt>.htaccess</tt> file if you turn this on.</td> -</tr> </table> <p>You can drag an item from the source list onto a text editor or into the terminal to further customize the Apache configuration.</p> English.lproj/PassengerPaneHelp/PassengerPaneHelp.html @@ -2,9 +2,9 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9E17</string> + <string key="IBDocument.SystemVersion">9F33</string> <string key="IBDocument.InterfaceBuilderVersion">670</string> - <string key="IBDocument.AppKitVersion">949.33</string> + <string key="IBDocument.AppKitVersion">949.34</string> <string key="IBDocument.HIToolboxVersion">352.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -484,33 +484,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSCellBackgroundColor" ref="131886356"/> <reference key="NSFont" ref="829849519"/> </object> - <object class="NSButton" id="73888779"> - <reference key="NSNextResponder" ref="452669158"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{91, 35}, {190, 18}}</string> - <reference key="NSSuperview" ref="452669158"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="866162661"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Allow custom rewrite rules</string> - <reference key="NSSupport" ref="829849519"/> - <reference key="NSControlView" ref="73888779"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">130</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSSwitch</string> - </object> - <object class="NSButtonImageSource" key="NSAlternateImage"> - <string key="NSImageName">NSSwitch</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> <object class="NSTextField" id="425273535"> <reference key="NSNextResponder" ref="452669158"/> <int key="NSvFlags">268</int> @@ -1094,22 +1067,6 @@ dHRwOi8vd3d3Lm1vZHJhaWxzLmNvbSBmb3IgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9ucy4</string> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">enabled: authorized</string> - <reference key="source" ref="73888779"/> - <reference key="destination" ref="565115411"/> - <object class="NSNibBindingConnector" key="connector" id="261940900"> - <reference key="NSSource" ref="73888779"/> - <reference key="NSDestination" ref="565115411"/> - <string key="NSLabel">enabled: authorized</string> - <string key="NSBinding">enabled</string> - <string key="NSKeyPath">authorized</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">339</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">enabled: authorized</string> <reference key="source" ref="713455384"/> <reference key="destination" ref="565115411"/> <object class="NSNibBindingConnector" key="connector" id="920714357"> @@ -1223,26 +1180,6 @@ dHRwOi8vd3d3Lm1vZHJhaWxzLmNvbSBmb3IgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9ucy4</string> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.allow_mod_rewrite</string> - <reference key="source" ref="73888779"/> - <reference key="destination" ref="467003467"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="73888779"/> - <reference key="NSDestination" ref="467003467"/> - <string key="NSLabel">value: selection.allow_mod_rewrite</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.allow_mod_rewrite</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSAllowsEditingMultipleValuesSelection</string> - <reference key="NS.object.0" ref="8"/> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">359</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">enabled: canRemove</string> <reference key="source" ref="99992128"/> <reference key="destination" ref="467003467"/> @@ -1411,42 +1348,6 @@ dHRwOi8vd3d3Lm1vZHJhaWxzLmNvbSBmb3IgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9ucy4</string> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">enabled2: selection.host</string> - <reference key="source" ref="73888779"/> - <reference key="destination" ref="467003467"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="73888779"/> - <reference key="NSDestination" ref="467003467"/> - <string key="NSLabel">enabled2: selection.host</string> - <string key="NSBinding">enabled2</string> - <string key="NSKeyPath">selection.host</string> - <object class="NSDictionary" key="NSOptions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSMultipleValuesPlaceholder</string> - <string>NSNoSelectionPlaceholder</string> - <string>NSNotApplicablePlaceholder</string> - <string>NSNullPlaceholder</string> - <string>NSValueTransformerName</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8"/> - <reference ref="8"/> - <reference ref="7"/> - <reference ref="7"/> - <string>NSIsNotNil</string> - </object> - </object> - <reference key="NSPreviousConnector" ref="261940900"/> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">400</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">enabled3: selection.host</string> <reference key="source" ref="713455384"/> <reference key="destination" ref="467003467"/> @@ -1600,8 +1501,8 @@ dHRwOi8vd3d3Lm1vZHJhaWxzLmNvbSBmb3IgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9ucy4</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="0"/> - <real value="-1.000000e+00"/> + <reference ref="8"/> + <reference ref="7"/> </object> </object> <int key="NSNibBindingConnectorVersion">2</int> @@ -1880,7 +1781,6 @@ dHRwOi8vd3d3Lm1vZHJhaWxzLmNvbSBmb3IgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9ucy4</string> <reference ref="228518755"/> <reference ref="631300605"/> <reference ref="1057804348"/> - <reference ref="73888779"/> <reference ref="425273535"/> </object> <reference key="parent" ref="453226259"/> @@ -1914,20 +1814,6 @@ dHRwOi8vd3d3Lm1vZHJhaWxzLmNvbSBmb3IgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9ucy4</string> <reference key="parent" ref="425273535"/> </object> <object class="IBObjectRecord"> - <int key="objectID">253</int> - <reference key="object" ref="73888779"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="866162661"/> - </object> - <reference key="parent" ref="298054908"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">254</int> - <reference key="object" ref="866162661"/> - <reference key="parent" ref="73888779"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">247</int> <reference key="object" ref="1057804348"/> <object class="NSMutableArray" key="children"> @@ -2133,8 +2019,6 @@ dHRwOi8vd3d3Lm1vZHJhaWxzLmNvbSBmb3IgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9ucy4</string> <string>250.IBPluginDependency</string> <string>251.IBPluginDependency</string> <string>252.IBPluginDependency</string> - <string>253.IBPluginDependency</string> - <string>254.IBPluginDependency</string> <string>257.IBPluginDependency</string> <string>258.IBPluginDependency</string> <string>274.IBPluginDependency</string> @@ -2188,9 +2072,9 @@ dHRwOi8vd3d3Lm1vZHJhaWxzLmNvbSBmb3IgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9ucy4</string> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{71, 266}, {668, 438}}</string> + <string>{{325, 473}, {668, 438}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{71, 266}, {668, 438}}</string> + <string>{{325, 473}, {668, 438}}</string> <reference ref="9"/> <string>{{-5, 388}, {668, 438}}</string> <reference ref="9"/> @@ -2237,8 +2121,6 @@ dHRwOi8vd3d3Lm1vZHJhaWxzLmNvbSBmb3IgaW5zdGFsbGF0aW9uIGluc3RydWN0aW9ucy4</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> English.lproj/PassengerPref.xib @@ -45,13 +45,12 @@ class PassengerApplication < NSObject end end - kvc_accessor :host, :path, :aliases, :dirty, :valid, :revertable, :environment, :allow_mod_rewrite + kvc_accessor :host, :path, :aliases, :dirty, :valid, :revertable, :environment attr_accessor :user_defined_data, :vhostname def init if super_init @environment = DEVELOPMENT - @allow_mod_rewrite = false @new_app = true @dirty = @valid = @revertable = false @@ -174,7 +173,6 @@ class PassengerApplication < NSObject 'aliases' => @aliases.to_s, 'path' => @path.to_s, 'environment' => (@environment.nil? ? @custom_environment : (@environment == DEVELOPMENT ? 'development' : 'production')), - 'allow_mod_rewrite' => (@allow_mod_rewrite == true || @allow_mod_rewrite == 1), 'vhostname' => @vhostname, 'user_defined_data' => @user_defined_data } @@ -207,9 +205,6 @@ class PassengerApplication < NSObject @custom_environment = $2 end - data.gsub!(/\n\s*RailsAllowModRewrite\s+(off|on)/, '') - self.allow_mod_rewrite = ($1 == 'on') - data.gsub!(/<VirtualHost\s(.+?)>/, '') self.vhostname = $1 @@ -234,7 +229,6 @@ class PassengerApplication < NSObject 'aliases' => @aliases, 'path' => @path, 'environment' => @custom_environment || @environment, - 'allow_mod_rewrite' => @allow_mod_rewrite, 'user_defined_data' => @user_defined_data } end PassengerApplication.rb @@ -65,7 +65,6 @@ class ConfigInstaller (" ServerAlias #{app['aliases']}" unless app['aliases'].empty?), " DocumentRoot \"#{public_dir}\"", " #{app['app_type'].capitalize}Env #{app['environment']}", - (" RailsAllowModRewrite " << (app['allow_mod_rewrite'] ? 'on' : 'off') if app['app_type'] == 'rails'), (app['user_defined_data'] unless app['user_defined_data'].empty?), "</VirtualHost>" ].compact.join("\n") config_installer.rb @@ -16,7 +16,6 @@ describe "ConfigInstaller" do @app.aliases = 'manfred-s-blog.local my-blog.local' @app.path = '/User/het-manfred/rails code/blog' @app.environment = PassengerApplication::PRODUCTION - @app.allow_mod_rewrite = true @app.vhostname = 'het-manfreds-wiki.local:443' @installer = ConfigInstaller.new([@app.to_hash].to_yaml) @@ -34,7 +33,6 @@ describe "ConfigInstaller" do 'aliases' => 'manfred-s-blog.local my-blog.local', 'path' => '/User/het-manfred/rails code/blog', 'environment' => 'production', - 'allow_mod_rewrite' => true, 'vhostname' => 'het-manfreds-wiki.local:443', 'user_defined_data' => " <directory \"/User/het-manfred/rails code/blog/public\">\n Order allow,deny\n Allow from all\n </directory>" }] @@ -61,7 +59,6 @@ describe "ConfigInstaller" do ServerAlias manfred-s-blog.local my-blog.local DocumentRoot "/User/het-manfred/rails code/blog/public" RailsEnv production - RailsAllowModRewrite on <directory \"/User/het-manfred/rails code/blog/public\"> Order allow,deny Allow from all @@ -95,7 +92,6 @@ describe "ConfigInstaller" do ServerName het-manfreds-blog.local DocumentRoot "/User/het-manfred/rails code/blog/public" RailsEnv production - RailsAllowModRewrite on <directory \"/User/het-manfred/rails code/blog/public\"> Order allow,deny Allow from all test/config_installer_test.rb @@ -7,5 +7,4 @@ Order allow,deny Allow from all </directory> - RailsAllowModRewrite off </VirtualHost> \ No newline at end of file test/fixtures/blog.vhost.conf @@ -6,5 +6,4 @@ Order allow,deny Allow from all </directory> - RailsAllowModRewrite off </VirtualHost> \ No newline at end of file test/fixtures/staging.vhost.conf @@ -3,7 +3,6 @@ BindAddress 192.168.0.123 DocumentRoot "/Users/het-manfred/rails code/wiki/public" RailsEnv production - RailsAllowModRewrite on <Location "/"> AuthType Basic AuthName "Development Preview" test/fixtures/wiki.vhost.conf @@ -143,7 +143,6 @@ describe "PassengerApplication, in general" do passenger_app.aliases.should == "manfred-s-blog.local my-blog.local" passenger_app.path.should == "/Users/het-manfred/rails code/blog" passenger_app.environment.should == PassengerApplication::DEVELOPMENT - passenger_app.allow_mod_rewrite.should.be false passenger_app.vhostname.should == '*:80' passenger_app = PassengerApplication.alloc.initWithFile(File.expand_path('../fixtures/wiki.vhost.conf', __FILE__)) @@ -151,7 +150,6 @@ describe "PassengerApplication, in general" do passenger_app.aliases.should == "" passenger_app.path.should == "/Users/het-manfred/rails code/wiki" passenger_app.environment.should == PassengerApplication::PRODUCTION - passenger_app.allow_mod_rewrite.should.be true passenger_app.vhostname.should == 'het-manfreds-wiki.local:443' passenger_app.user_defined_data.should == %{ BindAddress 192.168.0.123 @@ -268,7 +266,6 @@ describe "PassengerApplication, in general" do assigns(:host, 'app.local'.to_ns) assigns(:aliases, 'alias1.local alias2.local'.to_ns) assigns(:user_defined_data, "<directory \"/some/path\">\n foo bar\n</directory>") - assigns(:allow_mod_rewrite, false.to_ns) assigns(:vhostname, 'het-manfreds-wiki.local:443') passenger_app.to_hash.should == { @@ -278,7 +275,6 @@ describe "PassengerApplication, in general" do 'aliases' => 'alias1.local alias2.local', 'path' => passenger_app.path, 'environment' => 'development', - 'allow_mod_rewrite' => false, 'vhostname' => 'het-manfreds-wiki.local:443', 'user_defined_data' => "<directory \"/some/path\">\n foo bar\n</directory>" } @@ -323,7 +319,6 @@ describe "PassengerApplication, in general" do passenger_app.setValue_forKey('', 'aliases') passenger_app.setValue_forKey('/some/path', 'path') passenger_app.setValue_forKey('production', 'environment') - passenger_app.setValue_forKey(true, 'allow_mod_rewrite') passenger_app.should.be.dirty passenger_app.should.be.valid @@ -331,8 +326,7 @@ describe "PassengerApplication, in general" do 'host' => 'foo.local', 'path' => '/some/path', 'aliases' => '', - 'environment' => 'production', - 'allow_mod_rewrite' => true, + 'environment' => 'production' } passenger_app.should.be.revertable @@ -343,8 +337,7 @@ describe "PassengerApplication, in general" do 'host' => 'het-manfreds-blog.local', 'aliases' => 'manfred-s-blog.local my-blog.local', 'path' => '/Users/het-manfred/rails code/blog', - 'environment' => 'development', - 'allow_mod_rewrite' => false + 'environment' => 'development' } end test/passenger_application_test.rb 8f81b78b61f6d338b8fb09ddc8ecb255a66b19e2 Eloy Duran eloy.de.enige@gmail.com http://github.com/alloy/passengerpane/commit/0aaf71392c17eae37595cf3837c6cf98ae279655 0aaf71392c17eae37595cf3837c6cf98ae279655 2008-12-03T08:03:15-08:00 2008-12-03T08:03:15-08:00 Removed the "Allow mod rewrite rules" from the UI because it's not an as highly used option as the others, we find. So let the user edit it in themselves. 198859e5071d253df5aa62a98ce5e4105c1629a6 Eloy Duran eloy.de.enige@gmail.com