rack-handler-apache 0.0.1 → 0.0.2

data/README.md

@@ -18,7 +18,7 @@ or
 
     rackup -s apache config.ru
 
-This will run a minimally configures apached instance as the current user. When you control-c your app,
+This will run a minimally configured Apache instance as the current user. When you control-c your app,
 the server will shutdown too.
 
 Yes, this is not the right way to run your production rails apps!
@@ -28,12 +28,42 @@ Yes, this is running as you, so there are the usual security issues!
 But it might be handy!!
 
 
-Things to document:
+Configuration Options
+---------------------
 
-* Everything!
-* Default configurations
-* How SSL support works
+* Port
 
-Things todo:
+  Port defaults to 8080
 
-* Better config customisation
+* Host
+
+  Interface to listen on. Default is 127.0.0.1.
+
+* SSLEnable
+
+  Boolean to enable use of SSL. Deafult is false.
+  If SSL is enables, then SSLCertificateFile and SSLPrivateKeyFile
+  must be set.
+
+* SSLCertificateFile
+
+  The SSL Certificate file name. (Note this is the file name, not a 
+  certificate object, like in Webricks SSLCertificate)
+
+* SSLPrivateKeyFile
+
+  The SSL Private Key file name. (Again this is not the key object)
+
+* ServerConfig
+
+  Additional httpd.conf lines for server.
+
+* HostConfig
+
+  Additional httpd.conf lines for <VirtualHost> section.
+
+
+Things todo
+-----------
+
+* Better config customisation - if anyone needs it

data/lib/rack/handler/apache.rb

@@ -10,23 +10,32 @@ module Rack
 
       def self.valid_options
         {
-          "Port=PORT" => "Port to listen on (default: 8080)",
-          #TODO#"Host=HOST" => "Hostname to listen on (default: localhost)",
+          "Port=PORT"                   => "Port to listen on (default: 8080)",
+          "Host=HOST"                   => "Hostname to listen on (default: 127.0.0.1)",
+          "SSLEnable=BOOL"              => "Enable https",
+          "SSLCertificateFile=FILENAME" => "SSL Certificate file name",
+          "SSLPrivateKeyFile=FILENAME"  => "SSL Private Key file name",
+          "ServerConfig=TEXT"           => "Additional httpd.conf lines for server",
+          "HostConfig=TEXT"             => "Additional httpd.conf lines for virtual host"
         }
       end
 
       def self.run(app, options={})
 
         unless ::File.exists? ::PhusionPassenger::APACHE2_MODULE
-          puts "Passenger apache module missing, did you run passenger-install-apache2-module?"
+          puts "Fatal: Passenger apache module missing, did you run passenger-install-apache2-module?"
           exit
         end
 
         @root      = ::Dir.pwd
         @port      = options[:Port] || 8080
+        @host      = options[:Host] || '127.0.0.1'
         @pid_file  = "#{@root}/tmp/rack-helper-apache.pid"
         @conf_file = "#{@root}/tmp/httpd.conf"
-        @passenger = `bundle exec passenger-install-apache2-module --snippet`
+
+        # Find the right passenger-install-apache2-module to get the config snipper
+        piam = ::File.expand_path("../../bin/passenger-install-apache2-module", $".find {|f|f=~/phusion_passenger.rb$/})
+        @passenger = `#{piam} --snippet`
 
         puts "Warning: Please use SSLCertificateFile, not SSLCertificate" if
           options[:SSLCertificate] && !options[:SSLCertificateFile]
@@ -37,7 +46,7 @@ module Rack
         config = <<-EOD.gsub(/^ {10}/, '')
           #{@passenger}
           User #{Etc.getlogin}
-          Listen #{@port}
+          Listen #{@host}:#{@port}
           PidFile #{@pid_file}
           ErrorLog #{$stdout.ttyname}
           LockFile #{@root}/tmp/rack-helper-apache.lock
@@ -50,7 +59,9 @@ module Rack
               AllowOverride all
               Options -MultiViews
             </Directory>
+            #{options[:HostConfig]}
           </VirtualHost>
+          #{options[:ServerConfig]}
         EOD
 
         if options[:SSLEnable]
@@ -73,6 +84,7 @@ module Rack
 
         if is_running?
           puts "...started [pid:#{get_pid}]"
+          puts "Available at #{options[:SSLEnable]?'https':'http'}://#{@host}:#{@port}"
           sleep 0.5 while is_running?
           puts "Apache terminated."
         else
@@ -117,7 +129,7 @@ module Rack
       def self.is_running?
         if pid=get_pid
           begin
-            ::Process.kill 0, pid
+            ::Process.kill 0, pid # 0 => check if process exists
             return true
           rescue Errno::ESRCH => e
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-handler-apache
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2010-04-28 00:00:00.000000000 Z
+date: 2010-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack