[DRE-commits] r1271 - packages-wip/mongrel/trunk/debian

[Filipe Lautert]

Author: filipe-guest
Date: 2007-01-11 13:16:55 +0100 (Thu, 11 Jan 2007)
New Revision: 1271

Added:
   packages-wip/mongrel/trunk/debian/dirs
Modified:
   packages-wip/mongrel/trunk/debian/control
   packages-wip/mongrel/trunk/debian/control.in
   packages-wip/mongrel/trunk/debian/init.d
   packages-wip/mongrel/trunk/debian/mongrel.1
   packages-wip/mongrel/trunk/debian/rules
Log:
* Added another variable to init.d file
* Added dirs file so it creates configuration dirs
* Corrected rules so now it doesn't create files in /usr/local



Modified: packages-wip/mongrel/trunk/debian/control
===================================================================
--- packages-wip/mongrel/trunk/debian/control	2007-01-10 19:11:52 UTC (rev 1270)
+++ packages-wip/mongrel/trunk/debian/control	2007-01-11 12:16:55 UTC (rev 1271)
@@ -9,7 +9,7 @@
 
 Package: mongrel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 (>=1.8.4), libgems-ruby1.8, libgemplugin-ruby (>=0.2.2)
+Depends: ${shlibs:Depends}, ruby1.8 (>=1.8.4), libgems-ruby1.8, libgemplugin-ruby (>=0.2.2)
 Recommends: rails
 Description: A small fast HTTP library and server that runs Rails, Camping, and Nitro apps
  Mongrel is a fast HTTP library and server for Ruby that is intended

Modified: packages-wip/mongrel/trunk/debian/control.in
===================================================================
--- packages-wip/mongrel/trunk/debian/control.in	2007-01-10 19:11:52 UTC (rev 1270)
+++ packages-wip/mongrel/trunk/debian/control.in	2007-01-11 12:16:55 UTC (rev 1271)
@@ -10,7 +10,7 @@
 
 Package: mongrel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby1.8 (>=1.8.4), libgems-ruby1.8, libgemplugin-ruby (>=0.2.2), 
+Depends: ${shlibs:Depends}, ruby1.8 (>=1.8.4), libgems-ruby1.8, libgemplugin-ruby (>=0.2.2), 
 Recommends: rails
 Description: A small fast HTTP library and server that runs Rails, Camping, and Nitro apps
  Mongrel is a fast HTTP library and server for Ruby that is intended

Added: packages-wip/mongrel/trunk/debian/dirs
===================================================================
--- packages-wip/mongrel/trunk/debian/dirs	2007-01-10 19:11:52 UTC (rev 1270)
+++ packages-wip/mongrel/trunk/debian/dirs	2007-01-11 12:16:55 UTC (rev 1271)
@@ -0,0 +1,3 @@
+etc/mongrel/
+etc/mongrel/sites-available/
+etc/mongrel/sites-enabled/

Modified: packages-wip/mongrel/trunk/debian/init.d
===================================================================
--- packages-wip/mongrel/trunk/debian/init.d	2007-01-10 19:11:52 UTC (rev 1270)
+++ packages-wip/mongrel/trunk/debian/init.d	2007-01-11 12:16:55 UTC (rev 1271)
@@ -26,7 +26,7 @@
 # run the given command ($2, {start|stop|reload}) for the given app ($1)
 for_app() {
   #reset all variables that can be used on the configuration file
-  for i in "dir port servers proxy_port env additional_pen_opts pen_status_file"; do
+  for i in "dir port servers proxy_port env additional_pen_opts pen_status_file bind_address"; do
     unset $i
   done
 
@@ -46,7 +46,11 @@
   	env="production"
   fi
 
-  DAEMON_OPTS="start -e $env -a 127.0.0.1 -c $dir"
+  if [ -z $bind_address ]; then
+  	bind_address="127.0.0.1"
+  fi
+
+  DAEMON_OPTS="start -e $env -a $bind_address -c $dir"
   last_port=$(( $port + $servers - 1 ))
   case "$2" in
     start|reload)
@@ -106,7 +110,7 @@
   case "$2" in
     start)
       PEN_OPTS="$additional_pen_opts -fr $proxy_port "
-      if [ "x$pen_status_file" != "x" ]; then
+      if [ -n "$pen_status_file" ]; then
         PEN_OPTS="-w $dir/public/$pen_status_file $PEN_OPTS"
       fi
       last_port=$(( $port + $servers - 1 ))

Modified: packages-wip/mongrel/trunk/debian/mongrel.1
===================================================================
--- packages-wip/mongrel/trunk/debian/mongrel.1	2007-01-10 19:11:52 UTC (rev 1270)
+++ packages-wip/mongrel/trunk/debian/mongrel.1	2007-01-11 12:16:55 UTC (rev 1271)
@@ -37,11 +37,22 @@
 .br
 \fBservers\fP    number of servers to start. Each server will take it's own port, counting upwards from \fBport\fP.
 .br
-\fBproxy_port\fP port for the pen proxy server to listen for inbound connections. You should configure your frontend Web server (e.g. Apache) to forward requests for your application to this port.
+.PP
+The following variables are optional:
 .br
+\fBenv\fP                    environment the application shall run. If it isn't set, will default to production.
+.br
+\fBbind_address\fP           ip address to bind. If not set, will default to 127.0.0.1.
+.br
+\fBpen_status_file\fP        pen status file.
+.br
+\fBadditional_pen_opts\fP    additional options passed to pen.
+.br
+\fBproxy_port\fP             port for the pen proxy server to listen for inbound connections. You should configure your frontend Web server (e.g. Apache) to forward requests for your application to this port.
+.br
 .PP
 .SH SEE ALSO
-.BR pen (1)
+.BR pen (1), mongrel_rails (1)
 .br
 .SH AUTHOR
 Mongrel (http://mongrel.rubyforge.org/) was written by Zed Shaw.

Modified: packages-wip/mongrel/trunk/debian/rules
===================================================================
--- packages-wip/mongrel/trunk/debian/rules	2007-01-10 19:11:52 UTC (rev 1270)
+++ packages-wip/mongrel/trunk/debian/rules	2007-01-11 12:16:55 UTC (rev 1271)
@@ -10,6 +10,7 @@
 include /usr/share/ruby-pkg-tools/1/class/ruby-setup-rb.mk
 include /usr/share/ruby-pkg-tools/1/rules/uploaders.mk
 
+DEB_RUBY_CONFIG_ARGS = --installdirs=std --shebang=all
 
 # Upstream distributes only "Ruby gems". What do we do? Just gzip the gem
 # and use it as our orig.tar.gz - A gem contains two files: metadata.gz