passenger_pane_config.rb @@ -18,6 +18,7 @@ 518C7F770E06B665003A3ED0 /* SecurityHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 518C7F750E06B665003A3ED0 /* SecurityHelper.m */; }; 519DFB9F0DFDD825008A42FE /* PassengerApplication.rb in Resources */ = {isa = PBXBuildFile; fileRef = 519DFB9E0DFDD825008A42FE /* PassengerApplication.rb */; }; 519DFBA90DFE8EAF008A42FE /* shared_passenger_behaviour.rb in Resources */ = {isa = PBXBuildFile; fileRef = 519DFBA70DFE8EAF008A42FE /* shared_passenger_behaviour.rb */; }; + 51A703B10E648641006A1E26 /* passenger_pane_config.rb in Resources */ = {isa = PBXBuildFile; fileRef = 51A703B00E648641006A1E26 /* passenger_pane_config.rb */; }; 51B9190D0E01523900F45803 /* Alerts.icns in Resources */ = {isa = PBXBuildFile; fileRef = 51B9190C0E01523900F45803 /* Alerts.icns */; }; 51B919140E0172C200F45803 /* config_uninstaller.rb in Resources */ = {isa = PBXBuildFile; fileRef = 51B919130E0172C200F45803 /* config_uninstaller.rb */; }; 51D16FE30E07DFA000A46A7D /* PassengerPaneHelp in Resources */ = {isa = PBXBuildFile; fileRef = 51D16FDD0E07DFA000A46A7D /* PassengerPaneHelp */; }; @@ -50,6 +51,7 @@ 518C7F750E06B665003A3ED0 /* SecurityHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SecurityHelper.m; sourceTree = "<group>"; }; 519DFB9E0DFDD825008A42FE /* PassengerApplication.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = PassengerApplication.rb; sourceTree = "<group>"; }; 519DFBA70DFE8EAF008A42FE /* shared_passenger_behaviour.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = shared_passenger_behaviour.rb; sourceTree = "<group>"; }; + 51A703B00E648641006A1E26 /* passenger_pane_config.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = passenger_pane_config.rb; sourceTree = "<group>"; }; 51B9190C0E01523900F45803 /* Alerts.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Alerts.icns; sourceTree = "<group>"; }; 51B919130E0172C200F45803 /* config_uninstaller.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = config_uninstaller.rb; sourceTree = "<group>"; }; 51D16FDE0E07DFA000A46A7D /* English */ = {isa = PBXFileReference; lastKnownFileType = folder; name = English; path = English.lproj/PassengerPaneHelp; sourceTree = "<group>"; }; @@ -108,6 +110,7 @@ 518C7F720E06A668003A3ED0 /* Security.bridgesupport */, 5186C3150E090B59008D8E1F /* HelpHelper.h */, 5186C3160E090B59008D8E1F /* HelpHelper.m */, + 51A703B00E648641006A1E26 /* passenger_pane_config.rb */, 51B919130E0172C200F45803 /* config_uninstaller.rb */, 51B9190C0E01523900F45803 /* Alerts.icns */, 9648B5EE0D195C2F00DC73E2 /* Pref.xib */, @@ -242,6 +245,7 @@ 518C7F730E06A668003A3ED0 /* Security.bridgesupport in Resources */, 51D16FE30E07DFA000A46A7D /* PassengerPaneHelp in Resources */, 5189C6E70E111C3300B83EA5 /* LICENSE in Resources */, + 51A703B10E648641006A1E26 /* passenger_pane_config.rb in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; Passenger.xcodeproj/project.pbxproj @@ -3,6 +3,7 @@ include OSX require 'fileutils' require 'yaml' +require File.expand_path('../passenger_pane_config', __FILE__) require File.expand_path('../shared_passenger_behaviour', __FILE__) class PassengerApplication < NSObject @@ -18,7 +19,7 @@ class PassengerApplication < NSObject include SharedPassengerBehaviour def existingApplications - Dir.glob(File.join(PASSENGER_APPS_DIR, '*.vhost.conf')).map do |app| + Dir.glob(File.join(PassengerPaneConfig::PASSENGER_APPS_DIR, '*.vhost.conf')).map do |app| PassengerApplication.alloc.initWithFile(app) end end @@ -139,7 +140,7 @@ class PassengerApplication < NSObject end def config_path - File.join(PASSENGER_APPS_DIR, "#{@host}.vhost.conf") + File.join(PassengerPaneConfig::PASSENGER_APPS_DIR, "#{@host}.vhost.conf") end def rbSetValue_forKey(value, key) PassengerApplication.rb @@ -4,6 +4,7 @@ include OSX OSX.require_framework 'PreferencePanes' OSX.load_bridge_support_file File.expand_path('../Security.bridgesupport', __FILE__) +require File.expand_path('../passenger_pane_config', __FILE__) require File.expand_path('../shared_passenger_behaviour', __FILE__) require File.expand_path('../PassengerApplication', __FILE__) @@ -263,4 +264,4 @@ class PrefPanePassenger < NSPreferencePane @installPassengerWarning.hidden = false end end -end +end \ No newline at end of file PassengerPref.rb @@ -3,6 +3,7 @@ require 'osx/cocoa' require 'yaml' require 'fileutils' +require File.expand_path('../passenger_pane_config', __FILE__) class String def bypass_safe_level_1 @@ -28,19 +29,17 @@ class ConfigInstaller end end - VHOSTS_DIR = "/private/etc/apache2/passenger_pane_vhosts" def verify_vhost_conf - unless File.exist? VHOSTS_DIR - OSX::NSLog("Will create directory: #{VHOSTS_DIR}") - FileUtils.mkdir_p VHOSTS_DIR + unless File.exist? PassengerPaneConfig::PASSENGER_APPS_DIR + OSX::NSLog("Will create directory: #{PassengerPaneConfig::PASSENGER_APPS_DIR}") + FileUtils.mkdir_p PassengerPaneConfig::PASSENGER_APPS_DIR end end - CONF = "/private/etc/apache2/httpd.conf" def verify_httpd_conf - unless File.read(CONF).include? 'Include /private/etc/apache2/passenger_pane_vhosts/*.conf' - OSX::NSLog("Will try to append passenger pane vhosts conf to: #{CONF}") - File.open(CONF, 'a') do |f| + unless File.read(PassengerPaneConfig::HTTPD_CONF).include? "Include #{PassengerPaneConfig::PASSENGER_APPS_DIR}/*.conf" + OSX::NSLog("Will try to append passenger pane vhosts conf to: #{PassengerPaneConfig::HTTPD_CONF}") + File.open(PassengerPaneConfig::HTTPD_CONF, 'a') do |f| f << %{ # Added by the Passenger preference pane @@ -48,7 +47,7 @@ class ConfigInstaller # PassengerRoot, and PassengerRuby directives) before this section. <IfModule passenger_module> NameVirtualHost *:80 - Include /private/etc/apache2/passenger_pane_vhosts/*.conf + Include #{PassengerPaneConfig::PASSENGER_APPS_DIR}/*.conf </IfModule>} end end @@ -71,7 +70,7 @@ class ConfigInstaller end def restart_apache! - system "sudo /bin/launchctl stop org.apache.httpd" + system PassengerPaneConfig::APACHE_RESTART_COMMAND end def install! config_installer.rb @@ -2,6 +2,7 @@ require 'osx/cocoa' require 'yaml' +require File.expand_path('../passenger_pane_config', __FILE__) class String def bypass_safe_level_1 @@ -32,11 +33,11 @@ class ConfigUninstaller end def config_path(index) - "/private/etc/apache2/passenger_pane_vhosts/#{@data[index]['host'].bypass_safe_level_1}.vhost.conf" + "#{PassengerPaneConfig::PASSENGER_APPS_DIR}/#{@data[index]['host'].bypass_safe_level_1}.vhost.conf" end def restart_apache! - system "/bin/launchctl stop org.apache.httpd" + system PassengerPaneConfig::APACHE_RESTART_COMMAND end def uninstall! config_uninstaller.rb @@ -1,8 +1,6 @@ module SharedPassengerBehaviour include OSX - PASSENGER_APPS_DIR = "/private/etc/apache2/passenger_pane_vhosts" - def execute(command, *args) if OSX::SecurityHelper.sharedInstance.executeCommand_withArgs(command, args) == 0 alert = OSX::NSAlert.alloc.init shared_passenger_behaviour.rb @@ -86,19 +86,17 @@ describe "ConfigInstaller" do end it "should check if the vhost directory exists, if not add it" do - dir = "/private/etc/apache2/passenger_pane_vhosts" - File.expects(:exist?).with(dir).returns(false) - FileUtils.expects(:mkdir_p).with(dir) + File.expects(:exist?).with(PassengerPaneConfig::PASSENGER_APPS_DIR).returns(false) + FileUtils.expects(:mkdir_p).with(PassengerPaneConfig::PASSENGER_APPS_DIR) @installer.verify_vhost_conf end it "should check if our configuration to load the vhosts has been added to the apache conf yet" do - conf = "/private/etc/apache2/httpd.conf" - File.stubs(:read).with(conf).returns("Include /private/etc/apache2/other/*.conf") + File.stubs(:read).with(PassengerPaneConfig::HTTPD_CONF).returns("Include #{PassengerPaneConfig::APACHE_DIR}/other/*.conf") file_mock = mock("Apache conf") - File.expects(:open).with(conf, 'a').yields(file_mock) + File.expects(:open).with(PassengerPaneConfig::HTTPD_CONF, 'a').yields(file_mock) file_mock.expects(:<<).with(%{ # Added by the Passenger preference pane @@ -106,23 +104,22 @@ describe "ConfigInstaller" do # PassengerRoot, and PassengerRuby directives) before this section. <IfModule passenger_module> NameVirtualHost *:80 - Include /private/etc/apache2/passenger_pane_vhosts/*.conf + Include #{PassengerPaneConfig::PASSENGER_APPS_DIR}/*.conf </IfModule>}) @installer.verify_httpd_conf end it "should not add the vhosts configuration to the apache conf if it's in there already" do - conf = "/private/etc/apache2/httpd.conf" - File.stubs(:read).with(conf).returns(%{ -Include /private/etc/apache2/other/*.conf + File.stubs(:read).with(PassengerPaneConfig::HTTPD_CONF).returns(%{ +Include #{PassengerPaneConfig::APACHE_DIR}/other/*.conf # Added by the Passenger preference pane # Make sure to include the Passenger configuration (the LoadModule, # PassengerRoot, and PassengerRuby directives) before this section. <IfModule passenger_module> NameVirtualHost *:80 - Include /private/etc/apache2/passenger_pane_vhosts/*.conf + Include #{PassengerPaneConfig::PASSENGER_APPS_DIR}/*.conf </IfModule>}) File.expects(:open).times(0) @@ -130,11 +127,10 @@ Include /private/etc/apache2/other/*.conf end it "should not check if our configuration to load the vhosts has been added to the apache conf yet" do - conf = "/private/etc/apache2/httpd.conf" - File.stubs(:read).with(conf).returns("Include /private/etc/apache2/other/*.conf") + File.stubs(:read).with(PassengerPaneConfig::HTTPD_CONF).returns("Include #{PassengerPaneConfig::APACHE_DIR}/other/*.conf") file_mock = mock("Apache conf") - File.expects(:open).with(conf, 'a').yields(file_mock) + File.expects(:open).with(PassengerPaneConfig::HTTPD_CONF, 'a').yields(file_mock) file_mock.expects(:<<).with(%{ # Added by the Passenger preference pane @@ -142,14 +138,14 @@ Include /private/etc/apache2/other/*.conf # PassengerRoot, and PassengerRuby directives) before this section. <IfModule passenger_module> NameVirtualHost *:80 - Include /private/etc/apache2/passenger_pane_vhosts/*.conf + Include #{PassengerPaneConfig::PASSENGER_APPS_DIR}/*.conf </IfModule>}) @installer.verify_httpd_conf end it "should restart Apache" do - @installer.expects(:system).with("sudo /bin/launchctl stop org.apache.httpd") + @installer.expects(:system).with(PassengerPaneConfig::APACHE_RESTART_COMMAND) @installer.restart_apache! end test/config_installer_test.rb @@ -32,7 +32,7 @@ describe "ConfigUninstaller" do end it "should return the path to the vhost config" do - @uninstaller.config_path(0).should == "/private/etc/apache2/passenger_pane_vhosts/het-manfreds-blog.local.vhost.conf" + @uninstaller.config_path(0).should == "#{PassengerPaneConfig::PASSENGER_APPS_DIR}/het-manfreds-blog.local.vhost.conf" end it "should remove the vhost config file" do @@ -42,7 +42,7 @@ describe "ConfigUninstaller" do end it "should restart Apache" do - @uninstaller.expects(:system).with("/bin/launchctl stop org.apache.httpd") + @uninstaller.expects(:system).with(PassengerPaneConfig::APACHE_RESTART_COMMAND) @uninstaller.restart_apache! end test/config_uninstaller_test.rb @@ -142,7 +142,7 @@ describe "PassengerApplication, in general" do end it "should return the path to the config file" do - passenger_app.config_path.should == File.join(SharedPassengerBehaviour::PASSENGER_APPS_DIR, "het-manfreds-blog.local.vhost.conf") + passenger_app.config_path.should == File.join(PassengerPaneConfig::PASSENGER_APPS_DIR, "het-manfreds-blog.local.vhost.conf") end it "should be able to save the config file" do @@ -255,7 +255,7 @@ describe "PassengerApplication, in general" do end it "should load existing applications" do - dir = SharedPassengerBehaviour::PASSENGER_APPS_DIR + dir = PassengerPaneConfig::PASSENGER_APPS_DIR blog, paste = ["#{dir}/blog.vhost.conf", "#{dir}/paste.vhost.conf"] blog_app, paste_app = stub("PassengerApplication: blog"), stub("PassengerApplication: paste") test/passenger_application_test.rb @@ -106,7 +106,7 @@ describe "PrefPanePassenger, when about to be (re)displayed" do installPassengerWarning.hidden?.should.be true end - it "should add existing applications found in #{SharedPassengerBehaviour::PASSENGER_APPS_DIR} to the array controller: applicationsController" do + it "should add existing applications found in #{PassengerPaneConfig::PASSENGER_APPS_DIR} to the array controller: applicationsController" do blog_app, paste_app = add_applications! pref_pane.paneWillBecomeActive @@ -126,7 +126,7 @@ describe "PrefPanePassenger, when about to be (re)displayed" do private def add_applications! - dir = SharedPassengerBehaviour::PASSENGER_APPS_DIR + dir = PassengerPaneConfig::PASSENGER_APPS_DIR blog, paste = ["#{dir}/blog.vhost.conf", "#{dir}/paste.vhost.conf"] apps = stub("PassengerApplication: blog"), stub("PassengerApplication: paste") PassengerApplication.stubs(:existingApplications).returns(apps) test/pref_pane_passenger_test.rb e2bf8d77cece5b99df8e9ee5052598f446a6d695 Eloy Duran eloy.de.enige@gmail.com http://github.com/alloy/passengerpane/commit/8b6387ca9b022cabbe10e5fa36c28e8f4c11a6db 8b6387ca9b022cabbe10e5fa36c28e8f4c11a6db 2008-08-26T11:48:14-07:00 2008-08-26T11:48:14-07:00 Refactored all paths to Apache dirs into a central config module PassengerPaneConfig. This should make it easier for people to configure for a custom Apache. [#18 state:resolved] 4ccad372904e0dbc0db9a928ed07021338376f4b Eloy Duran eloy.de.enige@gmail.com