[DRE-commits] r5021 - in trunk/redmine/debian: . doc/examples
Jérémy Lal
kapouer-guest at alioth.debian.org
Sat Mar 27 18:39:17 UTC 2010
Author: kapouer-guest
Date: 2010-03-27 18:39:03 +0000 (Sat, 27 Mar 2010)
New Revision: 5021
Added:
trunk/redmine/debian/doc/examples/apache2-passenger-alias.conf
trunk/redmine/debian/doc/examples/apache2-passenger-host.conf
trunk/redmine/debian/doc/examples/nginx-alias.conf
trunk/redmine/debian/doc/examples/run-redmine-fcgi
trunk/redmine/debian/examples
Removed:
trunk/redmine/debian/doc/examples/apache2-passenger.conf
trunk/redmine/debian/docs
Modified:
trunk/redmine/debian/rules
Log:
More www config examples. Use dh_installexamples.
Added: trunk/redmine/debian/doc/examples/apache2-passenger-alias.conf
===================================================================
--- trunk/redmine/debian/doc/examples/apache2-passenger-alias.conf (rev 0)
+++ trunk/redmine/debian/doc/examples/apache2-passenger-alias.conf 2010-03-27 18:39:03 UTC (rev 5021)
@@ -0,0 +1,17 @@
+# These modules must be enabled : passenger
+# Configuration for http://localhost/redmine
+<VirtualHost localhost>
+ # ServerName my.domain.name
+ # this is the passenger config
+ RailsEnv production
+ SetEnv X_DEBIAN_SITEID "default"
+ SetEnv RAILS_RELATIVE_URL_ROOT "/redmine"
+ # apache2 serves public files
+ DocumentRoot /usr/share/redmine/public
+ Alias "/redmine/plugin_assets/" /var/cache/redmine/default/plugin_assets/
+ Alias "/redmine" /usr/share/redmine/public
+ <Directory "/usr/share/redmine/public">
+ Order allow,deny
+ Allow from all
+ </Directory>
+</VirtualHost>
Added: trunk/redmine/debian/doc/examples/apache2-passenger-host.conf
===================================================================
--- trunk/redmine/debian/doc/examples/apache2-passenger-host.conf (rev 0)
+++ trunk/redmine/debian/doc/examples/apache2-passenger-host.conf 2010-03-27 18:39:03 UTC (rev 5021)
@@ -0,0 +1,16 @@
+# These modules must be enabled : passenger
+# Configuration for http://localhost:3000/
+# listen the port...
+Listen 3000
+<VirtualHost localhost:3000>
+ # ServerName my.domain.name
+ # this is the passenger config
+ RailsEnv production
+ SetEnv X_DEBIAN_SITEID "default"
+ Alias "/plugin_assets/" /var/cache/redmine/default/plugin_assets/
+ DocumentRoot /usr/share/redmine/public
+ <Directory "/usr/share/redmine/public">
+ Order allow,deny
+ Allow from all
+ </Directory>
+</VirtualHost>
Deleted: trunk/redmine/debian/doc/examples/apache2-passenger.conf
===================================================================
--- trunk/redmine/debian/doc/examples/apache2-passenger.conf 2010-03-27 15:43:24 UTC (rev 5020)
+++ trunk/redmine/debian/doc/examples/apache2-passenger.conf 2010-03-27 18:39:03 UTC (rev 5021)
@@ -1,14 +0,0 @@
-# These modules must be enabled : passenger
-# Configuration for http://localhost/redmine
-<VirtualHost localhost>
- # this is the passenger config
- RailsEnv production
- RailsBaseURI /redmine
- SetEnv X_DEBIAN_SITEID "default"
- Alias "/redmine/plugin_assets/" /var/cache/redmine/default/plugin_assets/
- DocumentRoot /usr/share/redmine/public
- <Directory "/usr/share/redmine/public">
- Order allow,deny
- Allow from all
- </Directory>
-</VirtualHost>
Added: trunk/redmine/debian/doc/examples/nginx-alias.conf
===================================================================
--- trunk/redmine/debian/doc/examples/nginx-alias.conf (rev 0)
+++ trunk/redmine/debian/doc/examples/nginx-alias.conf 2010-03-27 18:39:03 UTC (rev 5021)
@@ -0,0 +1,16 @@
+upstream redmine_default {
+ # the socket a fastcgi process is bound to
+ server unix:/var/run/redmine/sockets/default/fcgi.socket;
+}
+server {
+ location /redmine {
+ alias /usr/share/redmine/public;
+ try_files $uri @fcgi;
+ }
+ location @fcgi {
+ include /etc/nginx/fastcgi_params;
+ fastcgi_param SCRIPT_FILENAME /usr/share/redmine/public/$fastcgi_script_name;
+ fastcgi_pass redmine_default;
+ fastcgi_index index.html;
+ }
+}
Added: trunk/redmine/debian/doc/examples/run-redmine-fcgi
===================================================================
--- trunk/redmine/debian/doc/examples/run-redmine-fcgi (rev 0)
+++ trunk/redmine/debian/doc/examples/run-redmine-fcgi 2010-03-27 18:39:03 UTC (rev 5021)
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# this is an example of a /etc/sv/redmine_default/run file,
+# as would be used by runit
+# To spawn the fcgi instance, it uses spawn-fcgi.
+# To monitor multiple instances bound to only one socket,
+# it uses multiwatch
+
+exec 2>&1
+RAILS_RELATIVE_URL_ROOT="/redmine" \
+X_DEBIAN_SITEID="default" \
+RAILS_ENV="production" \
+exec /usr/bin/spawn-fcgi -n -s /var/run/redmine/sockets/default/fcgi.socket \
+-u www-data -- \
+/usr/bin/multiwatch -f 2 /usr/share/redmine/public/dispatch.fcgi
Deleted: trunk/redmine/debian/docs
===================================================================
--- trunk/redmine/debian/docs 2010-03-27 15:43:24 UTC (rev 5020)
+++ trunk/redmine/debian/docs 2010-03-27 18:39:03 UTC (rev 5021)
@@ -1 +0,0 @@
-debian/doc/examples
Added: trunk/redmine/debian/examples
===================================================================
--- trunk/redmine/debian/examples (rev 0)
+++ trunk/redmine/debian/examples 2010-03-27 18:39:03 UTC (rev 5021)
@@ -0,0 +1,2 @@
+debian/doc/examples/*
+config/email.yml.example
Modified: trunk/redmine/debian/rules
===================================================================
--- trunk/redmine/debian/rules 2010-03-27 15:43:24 UTC (rev 5020)
+++ trunk/redmine/debian/rules 2010-03-27 18:39:03 UTC (rev 5021)
@@ -36,8 +36,6 @@
# rename cgi script, check permissions
mv debian/redmine/usr/share/redmine/public/dispatch.fcgi.example debian/redmine/usr/share/redmine/public/dispatch.fcgi
- # move email.yml example to doc/examples
- mv debian/redmine/usr/share/redmine/config/email.yml.example debian/doc/examples/email.yml
# remove example config files
rm -f debian/redmine/usr/share/redmine/config/database.yml.example
More information about the Pkg-ruby-extras-commits
mailing list