[Pkg-mono-svn-commits] rev 4001 - in xsp/trunk/debian: . po
Jo Shields
directhex-guest at alioth.debian.org
Sun Jun 14 23:55:53 UTC 2009
Author: directhex-guest
Date: 2009-06-14 23:55:53 +0000 (Sun, 14 Jun 2009)
New Revision: 4001
Added:
xsp/trunk/debian/asp.net-examples.hostxsp1
xsp/trunk/debian/mono-apache-server.links
xsp/trunk/debian/mono-apache-server1.README.Debian
xsp/trunk/debian/mono-apache-server1.config
xsp/trunk/debian/mono-apache-server1.default
xsp/trunk/debian/mono-apache-server1.dirs
xsp/trunk/debian/mono-apache-server1.docs
xsp/trunk/debian/mono-apache-server1.install
xsp/trunk/debian/mono-apache-server1.manpages
xsp/trunk/debian/mono-apache-server1.postinst
xsp/trunk/debian/mono-apache-server1.templates
xsp/trunk/debian/mono-fastcgi-server.links
xsp/trunk/debian/mono-fastcgi-server1.README.Debian
xsp/trunk/debian/mono-fastcgi-server1.dirs
xsp/trunk/debian/mono-fastcgi-server1.docs
xsp/trunk/debian/mono-fastcgi-server1.install
xsp/trunk/debian/mono-fastcgi-server1.manpages
xsp/trunk/debian/mono-xsp.links
xsp/trunk/debian/mono-xsp1.README.Debian
xsp/trunk/debian/mono-xsp1.config
xsp/trunk/debian/mono-xsp1.default
xsp/trunk/debian/mono-xsp1.dirs
xsp/trunk/debian/mono-xsp1.docs
xsp/trunk/debian/mono-xsp1.init
xsp/trunk/debian/mono-xsp1.install
xsp/trunk/debian/mono-xsp1.manpages
xsp/trunk/debian/mono-xsp1.postinst
xsp/trunk/debian/mono-xsp1.postrm
xsp/trunk/debian/mono-xsp1.preinst
xsp/trunk/debian/mono-xsp1.prerm
xsp/trunk/debian/mono-xsp1.templates
xsp/trunk/debian/postinst-monoxsp1
xsp/trunk/debian/postrm-monoxsp1
Removed:
xsp/trunk/debian/asp.net-examples.hostxsp
xsp/trunk/debian/mono-apache-server.README.Debian
xsp/trunk/debian/mono-apache-server.config
xsp/trunk/debian/mono-apache-server.default
xsp/trunk/debian/mono-apache-server.dirs
xsp/trunk/debian/mono-apache-server.docs
xsp/trunk/debian/mono-apache-server.install
xsp/trunk/debian/mono-apache-server.manpages
xsp/trunk/debian/mono-apache-server.postinst
xsp/trunk/debian/mono-apache-server.templates
xsp/trunk/debian/mono-fastcgi-server.README.Debian
xsp/trunk/debian/mono-fastcgi-server.dirs
xsp/trunk/debian/mono-fastcgi-server.docs
xsp/trunk/debian/mono-fastcgi-server.install
xsp/trunk/debian/mono-fastcgi-server.manpages
xsp/trunk/debian/mono-xsp.README.Debian
xsp/trunk/debian/mono-xsp.config
xsp/trunk/debian/mono-xsp.default
xsp/trunk/debian/mono-xsp.dirs
xsp/trunk/debian/mono-xsp.docs
xsp/trunk/debian/mono-xsp.init
xsp/trunk/debian/mono-xsp.install
xsp/trunk/debian/mono-xsp.manpages
xsp/trunk/debian/mono-xsp.postinst
xsp/trunk/debian/mono-xsp.postrm
xsp/trunk/debian/mono-xsp.preinst
xsp/trunk/debian/mono-xsp.prerm
xsp/trunk/debian/mono-xsp.templates
xsp/trunk/debian/patches/
xsp/trunk/debian/postinst-monoxsp
xsp/trunk/debian/postrm-monoxsp
Modified:
xsp/trunk/debian/changelog
xsp/trunk/debian/control
xsp/trunk/debian/dh_installxsp
xsp/trunk/debian/mono-xsp-base.install
xsp/trunk/debian/mono-xsp-update.conf
xsp/trunk/debian/mono-xsp2.init
xsp/trunk/debian/po/POTFILES.in
xsp/trunk/debian/rules
Log:
* debian/control,
debian/dh_installxsp,
debian/po/POTFILES.in,
debian/pretty_much_everything:
+ Move all references of "xsp" to "xsp1", in order to free up
"xsp" for an unversioned link to the latest version (i.e. xsp2)
* debian/mono-apache-server.links,
debian/mono-xsp.links,
debian/mono-fastcgi-server.links,
debian/control
+ Create new metapackages pointing to the default versions of
packages with versioned commands, including man pages
+ Conflict with older versions of the packages, since "old" xsp
packages are renamed to xsp1.
* debian/control,
debian/rules:
+ Remove dpatch
* debian/rules:
+ Delete all compiled files in clean rule, to be sure build can happen
twice in a row
* debian/control,
debian/dh_installxsp:
+ Rename cli:XspServer1 to cli:XspServer1. The impact is low, and the
workarounds to keep the old name are messy
Deleted: xsp/trunk/debian/asp.net-examples.hostxsp
===================================================================
--- xsp/trunk/debian/asp.net-examples.hostxsp 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/asp.net-examples.hostxsp 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,5 +0,0 @@
-# This is the configuration file
-# for the aspnet-examples virtualhost
-path = /usr/share/asp.net-demos
-alias = /samples
-libs = /usr/lib/mono/1.0
Copied: xsp/trunk/debian/asp.net-examples.hostxsp1 (from rev 3997, xsp/trunk/debian/asp.net-examples.hostxsp)
===================================================================
--- xsp/trunk/debian/asp.net-examples.hostxsp1 (rev 0)
+++ xsp/trunk/debian/asp.net-examples.hostxsp1 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,5 @@
+# This is the configuration file
+# for the aspnet-examples virtualhost
+path = /usr/share/asp.net-demos
+alias = /samples
+libs = /usr/lib/mono/1.0
Property changes on: xsp/trunk/debian/asp.net-examples.hostxsp1
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: xsp/trunk/debian/changelog
===================================================================
--- xsp/trunk/debian/changelog 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/changelog 2009-06-14 23:55:53 UTC (rev 4001)
@@ -10,8 +10,32 @@
+ Bump standards version to 3.8.1
+ Bump minimum Mono version to 2.4
+ Change build-dep on Nunit to 2.4 (Closes: #531927)
+ * debian/control,
+ debian/dh_installxsp,
+ debian/po/POTFILES.in,
+ debian/pretty_much_everything:
+ + Move all references of "xsp" to "xsp1", in order to free up
+ "xsp" for an unversioned link to the latest version (i.e. xsp2)
+ * debian/mono-apache-server.links,
+ debian/mono-xsp.links,
+ debian/mono-fastcgi-server.links,
+ debian/control
+ + Create new metapackages pointing to the default versions of
+ packages with versioned commands, including man pages
+ + Conflict with older versions of the packages, since "old" xsp
+ packages are renamed to xsp1.
+ * debian/control,
+ debian/rules:
+ + Remove dpatch
+ * debian/rules:
+ + Delete all compiled files in clean rule, to be sure build can happen
+ twice in a row
+ * debian/control,
+ debian/dh_installxsp:
+ + Rename cli:XspServer to cli:XspServer1. The impact is low, and the
+ workarounds to keep the old name are messy
- -- Jo Shields <directhex at apebox.org> Fri, 05 Jun 2009 07:21:36 +0100
+ -- Jo Shields <directhex at apebox.org> Sun, 14 Jun 2009 23:55:46 +0100
xsp (2.0-2) unstable; urgency=low
Modified: xsp/trunk/debian/control
===================================================================
--- xsp/trunk/debian/control 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/control 2009-06-14 23:55:53 UTC (rev 4001)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Dylan R. E. Moonfire <debian at mfgames.com>, Mirco Bauer <meebey at debian.org>, Jo Shields <directhex at apebox.org>
-Build-Depends: debhelper (>= 5.0.0), po-debconf, dpatch, autotools-dev
+Build-Depends: debhelper (>= 5.0.0), po-debconf, autotools-dev
Build-Depends-Indep: cli-common-dev (>= 0.5.4),
mono-devel (>= 2.4),
mono-1.0-devel (>= 2.4),
@@ -45,10 +45,11 @@
either through the standalone XSP version (mono-xsp2) or the Apache module
(mono-apache-server2).
-Package: mono-xsp
+Package: mono-xsp1
Architecture: all
Depends: ${misc:Depends}, ${cli:Depends}, net-tools, mono-xsp-base (= ${source:Version}), procps
-Description: simple web server to run ASP.NET applications
+Replaces: mono-xsp (<= 2.4)
+Description: simple web server to run ASP.NET 1.1 applications
XSP is a simple web server written in C# that can be used to run your
ASP.NET 1.1 applications.
.
@@ -58,16 +59,27 @@
Package: mono-xsp2
Architecture: all
Depends: ${misc:Depends}, ${cli:Depends}, net-tools, mono-xsp2-base (= ${source:Version}), procps
-Description: simple web server to run ASP.NET applications
+Description: simple web server to run ASP.NET 2.0 applications
XSP is a simple web server written in C# that can be used to run your
ASP.NET 1.1 and 2.0 applications.
.
This is the standalone ASP.NET web server. If you want to run ASP.NET
applications with Apache, look at mono-apache-server2.
+Package: mono-xsp
+Architecture: all
+Depends: mono-xsp2 (= ${source:Version}), ${misc:Depends}
+Description: simple web server to run ASP.NET applications - default version
+ XSP is a simple web server written in C# that can be used to run your
+ ASP.NET 1.1 applications.
+ .
+ This is a metapackage to pull in the standalone ASP.NET web server.
+ If you want to run ASP.NET applications with Apache, look at
+ mono-apache-server.
+
Package: asp.net-examples
Architecture: all
-Depends: ${misc:Depends}, ${cli:Depends}, ${cli:XspServer}
+Depends: ${misc:Depends}, ${cli:Depends}, ${cli:XspServer1}
Description: demo pages for ASP.NET 1.1 infrastructure
Sample set of .aspx pages to test the XSP server or the mod_mono Apache
module. This does not include the ASP.NET 2.0 examples.
@@ -79,38 +91,48 @@
Sample set of .aspx pages to test the XSP server or the mod_mono Apache
module. This is for the xsp2 and includes the 2.0 modules.
-Package: mono-apache-server
+Package: mono-apache-server1
Architecture: all
Conflicts: mono-server
-Replaces: mono-server
+Replaces: mono-server, mono-apache-server (<= 2.4)
Depends: ${misc:Depends}, ${cli:Depends}, net-tools, mono-xsp-base (= ${source:Version}), perl-modules
-Description: ASP.NET backend for mod_mono Apache module
+Description: ASP.NET 1.1 backend for mod_mono Apache module
mono-apache-server contains the backend for mod_mono. It lets you run ASP.NET
web applications via Apache. mod_mono will call mono-apache-server to parse
and compile the aspx code.
.
- This package requires you to install libapache-mod-mono for Apache 1.3 or
- libapache2-mod-mono for Apache 2.0.
+ This package requires you to install libapache2-mod-mono for Apache 2.0.
Package: mono-apache-server2
Architecture: all
Conflicts: mono-server
Replaces: mono-server
Depends: ${misc:Depends}, ${cli:Depends}, net-tools, mono-xsp2-base (= ${source:Version}), perl-modules
-Description: ASP.NET backend for mod_mono2 Apache module
+Description: ASP.NET 2.0 backend for mod_mono2 Apache module
mono-apache-server contains the backend for mod_mono. It lets you run ASP.NET
web applications via Apache. mod_mono will call mono-apache-server to parse
and compile the aspx code.
.
- This package requires you to install libapache-mod-mono for Apache 1.3 or
- libapache2-mod-mono for Apache 2.0.
+ This package requires you to install libapache2-mod-mono for Apache 2.0.
-Package: mono-fastcgi-server
+Package: mono-apache-server
Architecture: all
Conflicts: mono-server
Replaces: mono-server
+Depends: mono-apache-server2 (= ${source:Version}), ${misc:Depends}
+Description: ASP.NET backend for mod_mono2 Apache module - default version
+ mono-apache-server contains the backend for mod_mono. It lets you run ASP.NET
+ web applications via Apache. mod_mono will call mono-apache-server to parse
+ and compile the aspx code.
+ .
+ This package pulls in the default version of the Apache backend.
+
+Package: mono-fastcgi-server1
+Architecture: all
+Conflicts: mono-server
+Replaces: mono-server, mono-fastcgi-server (<= 2.4)
Depends: ${misc:Depends}, ${cli:Depends}, net-tools, mono-xsp-base (= ${source:Version}), perl-modules
-Description: ASP.NET backend for FastCGI webservers
+Description: ASP.NET 1.1 backend for FastCGI webservers
mono-fastcgi-server contains the backend for FastCGI. It lets you run
ASP.NET web applications via HTTP servers such as Lighttpd or Apache.
The FastCGI webserver shouldbe configured to run fastcgi-mono-server to
@@ -124,7 +146,7 @@
Conflicts: mono-server
Replaces: mono-server
Depends: ${misc:Depends}, ${cli:Depends}, net-tools, mono-xsp2-base (= ${source:Version}), perl-modules
-Description: ASP.NET backend for FastCGI webservers
+Description: ASP.NET 2.0 backend for FastCGI webservers
mono-fastcgi-server contains the backend for FastCGI. It lets you run
ASP.NET web applications via HTTP servers such as Lighttpd or Apache.
The FastCGI webserver should be configured to run fastcgi-mono-server to
@@ -132,3 +154,16 @@
.
This package requires you to install any FastCGI webserver, such as
Lighttpd or Apache (see libapache2-mod-fcgid).
+
+Package: mono-fastcgi-server
+Architecture: all
+Conflicts: mono-server
+Replaces: mono-server
+Depends: mono-fastcgi-server2 (= ${source:Version}), ${misc:Depends}
+Description: ASP.NET backend for FastCGI webservers - default version
+ mono-fastcgi-server contains the backend for FastCGI. It lets you run
+ ASP.NET web applications via HTTP servers such as Lighttpd or Apache.
+ The FastCGI webserver should be configured to run fastcgi-mono-server to
+ parse and compile the aspx code.
+ .
+ This package pulls in the default version of the FastCGI backend.
Modified: xsp/trunk/debian/dh_installxsp
===================================================================
--- xsp/trunk/debian/dh_installxsp 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/dh_installxsp 2009-06-14 23:55:53 UTC (rev 4001)
@@ -67,7 +67,7 @@
foreach my $package (@{$dh{DOPACKAGES}})
{
# Configure for both XSP and/or XSP 2
- process_xsp($package, "") if $install_xsp_1;
+ process_xsp($package, "1") if $install_xsp_1;
process_xsp($package, "2") if $install_xsp_2;
}
Deleted: xsp/trunk/debian/mono-apache-server.README.Debian
===================================================================
--- xsp/trunk/debian/mono-apache-server.README.Debian 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-apache-server.README.Debian 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,54 +0,0 @@
-mono-apache-server for Debian
---------------------------
-
-mod-mono-server is a backend server that allows you to run ASP.NET web
-applications in conjunction with Apache (1.3 or 2.0) and the mod_mono Apache
-module. In Debian, mod-mono-server is provided in the package
-mono-apache-server.
-
-mod-mono-server creates a socket in /tmp, and mod_mono communicates with
-mod-mono-server through that socket. Apache will pass the HTTP request via
-mod_mono to mod-mono-server, and mod-mono-server will pass the result back
-to Apache via mod_mono.
-
-So you need this package to run mod_mono, and vice versa.
-
-When mod_mono is installed, it will create a link to
-/etc/mono-server/mono-server-hosts.conf. This file contains the configuration
-for mod_mono. Among other things, it makes sure that aspx pages are handled
-by mono_mono, and it defines all your ASP.NET web applications and the mappings
-between URIs and the file system.
-
-However, you should NOT EDIT THIS FILE by hand. Instead, you can manage the
-mono-server-hosts.conf file with the administration scripts provided by
-mod-mono-server. The administration scripts work on a directory structure in
-/etc/mono-server -- this is what it looks like:
-
-/etc/mono-server <- The root of the configuration structure
-/etc/mono-server/conf.d <- VirtualHosts Config Directories
-/etc/mono-server/conf.d/monodoc <- MonoDoc Config Files
-
-To create an ASP.NET virtual host, you create a new directory under conf.d,
-such as the monodoc example above. Then, you place configuration files for
-that virtual host in the directory. Every file is marked by a number, an
-underscore, and the alias name for that ASP.NET application. For example:
-
-/etc/mono-server/conf.d/monodoc/10_monodochttp
-
-You then need to run mono-server-update, which will read the directory
-structure and rebuild the mono-server-hosts.conf file. mod-mono-server will
-automatically detect the changes in the file, and adjust its configuration
-accordingly. The mono-server-update script will also create a
-debian.webapp file, which is needed for the ASP.NET applications.
-
-Packages that wish to install ASP.NET web applications can just follow the
-above procedure. If mod-mono-server is running, the application will be
-automatically activated.
-
-You don't need to start mod-mono-server. If it's not running when a request
-comes in, mod_mono will start it (unless you have disabled mod_mono). Note
-that mono-server-update can start Apache.
-
-Happy Hacking!
-
- -- Pablo Fischer <pablo at pablo.com.mx>, Wed Mar 2 11:08:17 2005
Deleted: xsp/trunk/debian/mono-apache-server.config
===================================================================
--- xsp/trunk/debian/mono-apache-server.config 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-apache-server.config 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,30 +0,0 @@
-#!/bin/bash -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-db_capb backup
-db_title ModMono Server
-
-STATE=1
-while [ "$STATE" != 0 -a "$STATE" != 2 ]; do
- case "$STATE" in
- 1)
- db_input medium monoserver/monoserver_restartapache || true
- if db_go; then
- db_get monoserver/monoserver_restartapache || true
- if [ "$RET" = "true" ]; then
- STATE=2
- else
- db_set monoserver/monoserver_restartapache false || true
- STATE=2
- fi
- else
- STATE=0
- fi
- ;;
- esac
-done
-
-if [ "$STATE" = 0 ]; then
- exit 1
-fi
Deleted: xsp/trunk/debian/mono-apache-server.default
===================================================================
--- xsp/trunk/debian/mono-apache-server.default 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-apache-server.default 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,4 +0,0 @@
-# Defaults for mono-apache-server
-
-# Should mono-apache-server start apache?
-start_apache=false
Deleted: xsp/trunk/debian/mono-apache-server.dirs
===================================================================
--- xsp/trunk/debian/mono-apache-server.dirs 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-apache-server.dirs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,3 +0,0 @@
-usr/bin
-etc/mono-server
-etc/mono-server/conf.d
Deleted: xsp/trunk/debian/mono-apache-server.docs
===================================================================
--- xsp/trunk/debian/mono-apache-server.docs 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-apache-server.docs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,3 +0,0 @@
-NEWS
-README
-AUTHORS
Deleted: xsp/trunk/debian/mono-apache-server.install
===================================================================
--- xsp/trunk/debian/mono-apache-server.install 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-apache-server.install 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,5 +0,0 @@
-debian/tmp/usr/lib/mono/1.0/mod-mono-server.exe
-debian/tmp/usr/lib/mono/gac/mod-mono-server
-debian/tmp/usr/bin/mod-mono-server
-debian/tmp/usr/sbin/mono-server-admin
-debian/tmp/usr/sbin/mono-server-update
Added: xsp/trunk/debian/mono-apache-server.links
===================================================================
--- xsp/trunk/debian/mono-apache-server.links (rev 0)
+++ xsp/trunk/debian/mono-apache-server.links 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,2 @@
+usr/bin/mod-mono-server2 usr/bin/mod-mono-server
+usr/share/man/man1/mod-mono-server2.1 usr/share/man/man1/mod-mono-server.1
Deleted: xsp/trunk/debian/mono-apache-server.manpages
===================================================================
--- xsp/trunk/debian/mono-apache-server.manpages 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-apache-server.manpages 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,4 +0,0 @@
-debian/mono-server-admin.8
-debian/mono-server-update.8
-debian/update-mono-server.8
-man/mod-mono-server.1
Deleted: xsp/trunk/debian/mono-apache-server.postinst
===================================================================
--- xsp/trunk/debian/mono-apache-server.postinst 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-apache-server.postinst 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,45 +0,0 @@
-#!/bin/sh
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-modmono_default="/etc/default/mono-apache-server"
-
-restart_apache_on() {
- sed s/start_apache=false/start_apache=true/g $modmono_default > $tempfile
- cp $tempfile $modmono_default
-}
-
-restart_apache_off() {
- sed s/start_apache=true/start_apache=false/g $modmono_default > $tempfile
- cp $tempfile $modmono_default
-}
-
-daemon_turn_off() {
- if [ -x /etc/init.d/mono-server ]; then
- update-rc.d -f mono-server remove > /dev/null
- fi
-}
-
-case "$1" in
- configure)
- tempfile=$(/bin/tempfile)
-
- db_get monoserver/monoserver_restartapache || true
- daemon_turn_off
- if [ "$RET" = "true" ]; then
- restart_apache_on
- else
- restart_apache_off
- fi
-
- mono-server-update
-
- rm $tempfile
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: xsp/trunk/debian/mono-apache-server.templates
===================================================================
--- xsp/trunk/debian/mono-apache-server.templates 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-apache-server.templates 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,9 +0,0 @@
-Template: monoserver/monoserver_restartapache
-Type: boolean
-Default: true
-_Description: Let mono-apache-server restart Apache?
- The debian version of mono-apache-server includes a
- mono-server-update script that creates a configuration file for
- apache to start the ASP.NET applications, and mono-server-update can
- restart apache if there's a new configuration file
- (/etc/mono-server/mono-server-hosts.conf). If this is true, then apache will be restarted when there is a new mono-server-hosts.conf file.
Copied: xsp/trunk/debian/mono-apache-server1.README.Debian (from rev 3997, xsp/trunk/debian/mono-apache-server.README.Debian)
===================================================================
--- xsp/trunk/debian/mono-apache-server1.README.Debian (rev 0)
+++ xsp/trunk/debian/mono-apache-server1.README.Debian 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,54 @@
+mono-apache-server for Debian
+--------------------------
+
+mod-mono-server is a backend server that allows you to run ASP.NET web
+applications in conjunction with Apache (1.3 or 2.0) and the mod_mono Apache
+module. In Debian, mod-mono-server is provided in the package
+mono-apache-server.
+
+mod-mono-server creates a socket in /tmp, and mod_mono communicates with
+mod-mono-server through that socket. Apache will pass the HTTP request via
+mod_mono to mod-mono-server, and mod-mono-server will pass the result back
+to Apache via mod_mono.
+
+So you need this package to run mod_mono, and vice versa.
+
+When mod_mono is installed, it will create a link to
+/etc/mono-server/mono-server-hosts.conf. This file contains the configuration
+for mod_mono. Among other things, it makes sure that aspx pages are handled
+by mono_mono, and it defines all your ASP.NET web applications and the mappings
+between URIs and the file system.
+
+However, you should NOT EDIT THIS FILE by hand. Instead, you can manage the
+mono-server-hosts.conf file with the administration scripts provided by
+mod-mono-server. The administration scripts work on a directory structure in
+/etc/mono-server -- this is what it looks like:
+
+/etc/mono-server <- The root of the configuration structure
+/etc/mono-server/conf.d <- VirtualHosts Config Directories
+/etc/mono-server/conf.d/monodoc <- MonoDoc Config Files
+
+To create an ASP.NET virtual host, you create a new directory under conf.d,
+such as the monodoc example above. Then, you place configuration files for
+that virtual host in the directory. Every file is marked by a number, an
+underscore, and the alias name for that ASP.NET application. For example:
+
+/etc/mono-server/conf.d/monodoc/10_monodochttp
+
+You then need to run mono-server-update, which will read the directory
+structure and rebuild the mono-server-hosts.conf file. mod-mono-server will
+automatically detect the changes in the file, and adjust its configuration
+accordingly. The mono-server-update script will also create a
+debian.webapp file, which is needed for the ASP.NET applications.
+
+Packages that wish to install ASP.NET web applications can just follow the
+above procedure. If mod-mono-server is running, the application will be
+automatically activated.
+
+You don't need to start mod-mono-server. If it's not running when a request
+comes in, mod_mono will start it (unless you have disabled mod_mono). Note
+that mono-server-update can start Apache.
+
+Happy Hacking!
+
+ -- Pablo Fischer <pablo at pablo.com.mx>, Wed Mar 2 11:08:17 2005
Property changes on: xsp/trunk/debian/mono-apache-server1.README.Debian
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-apache-server1.config (from rev 3997, xsp/trunk/debian/mono-apache-server.config)
===================================================================
--- xsp/trunk/debian/mono-apache-server1.config (rev 0)
+++ xsp/trunk/debian/mono-apache-server1.config 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,30 @@
+#!/bin/bash -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+db_capb backup
+db_title ModMono Server
+
+STATE=1
+while [ "$STATE" != 0 -a "$STATE" != 2 ]; do
+ case "$STATE" in
+ 1)
+ db_input medium monoserver/monoserver_restartapache || true
+ if db_go; then
+ db_get monoserver/monoserver_restartapache || true
+ if [ "$RET" = "true" ]; then
+ STATE=2
+ else
+ db_set monoserver/monoserver_restartapache false || true
+ STATE=2
+ fi
+ else
+ STATE=0
+ fi
+ ;;
+ esac
+done
+
+if [ "$STATE" = 0 ]; then
+ exit 1
+fi
Property changes on: xsp/trunk/debian/mono-apache-server1.config
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-apache-server1.default (from rev 3997, xsp/trunk/debian/mono-apache-server.default)
===================================================================
--- xsp/trunk/debian/mono-apache-server1.default (rev 0)
+++ xsp/trunk/debian/mono-apache-server1.default 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,4 @@
+# Defaults for mono-apache-server
+
+# Should mono-apache-server start apache?
+start_apache=false
Property changes on: xsp/trunk/debian/mono-apache-server1.default
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-apache-server1.dirs (from rev 3997, xsp/trunk/debian/mono-apache-server.dirs)
===================================================================
--- xsp/trunk/debian/mono-apache-server1.dirs (rev 0)
+++ xsp/trunk/debian/mono-apache-server1.dirs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,3 @@
+usr/bin
+etc/mono-server
+etc/mono-server/conf.d
Property changes on: xsp/trunk/debian/mono-apache-server1.dirs
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-apache-server1.docs (from rev 3997, xsp/trunk/debian/mono-apache-server.docs)
===================================================================
--- xsp/trunk/debian/mono-apache-server1.docs (rev 0)
+++ xsp/trunk/debian/mono-apache-server1.docs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,3 @@
+NEWS
+README
+AUTHORS
Property changes on: xsp/trunk/debian/mono-apache-server1.docs
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-apache-server1.install (from rev 3997, xsp/trunk/debian/mono-apache-server.install)
===================================================================
--- xsp/trunk/debian/mono-apache-server1.install (rev 0)
+++ xsp/trunk/debian/mono-apache-server1.install 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/mono/1.0/mod-mono-server.exe
+debian/tmp/usr/lib/mono/gac/mod-mono-server
+debian/tmp/usr/bin/mod-mono-server1
+debian/tmp/usr/sbin/mono-server-admin
+debian/tmp/usr/sbin/mono-server-update
Property changes on: xsp/trunk/debian/mono-apache-server1.install
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-apache-server1.manpages (from rev 3997, xsp/trunk/debian/mono-apache-server.manpages)
===================================================================
--- xsp/trunk/debian/mono-apache-server1.manpages (rev 0)
+++ xsp/trunk/debian/mono-apache-server1.manpages 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,4 @@
+debian/mono-server-admin.8
+debian/mono-server-update.8
+debian/update-mono-server.8
+debian/tmp/usr/share/man/man1/mod-mono-server1.1
Property changes on: xsp/trunk/debian/mono-apache-server1.manpages
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-apache-server1.postinst (from rev 3997, xsp/trunk/debian/mono-apache-server.postinst)
===================================================================
--- xsp/trunk/debian/mono-apache-server1.postinst (rev 0)
+++ xsp/trunk/debian/mono-apache-server1.postinst 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,45 @@
+#!/bin/sh
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+modmono_default="/etc/default/mono-apache-server1"
+
+restart_apache_on() {
+ sed s/start_apache=false/start_apache=true/g $modmono_default > $tempfile
+ cp $tempfile $modmono_default
+}
+
+restart_apache_off() {
+ sed s/start_apache=true/start_apache=false/g $modmono_default > $tempfile
+ cp $tempfile $modmono_default
+}
+
+daemon_turn_off() {
+ if [ -x /etc/init.d/mono-server ]; then
+ update-rc.d -f mono-server remove > /dev/null
+ fi
+}
+
+case "$1" in
+ configure)
+ tempfile=$(/bin/tempfile)
+
+ db_get monoserver/monoserver_restartapache || true
+ daemon_turn_off
+ if [ "$RET" = "true" ]; then
+ restart_apache_on
+ else
+ restart_apache_off
+ fi
+
+ mono-server-update
+
+ rm $tempfile
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Property changes on: xsp/trunk/debian/mono-apache-server1.postinst
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-apache-server1.templates (from rev 3997, xsp/trunk/debian/mono-apache-server.templates)
===================================================================
--- xsp/trunk/debian/mono-apache-server1.templates (rev 0)
+++ xsp/trunk/debian/mono-apache-server1.templates 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,9 @@
+Template: monoserver/monoserver_restartapache
+Type: boolean
+Default: true
+_Description: Let mono-apache-server restart Apache?
+ The debian version of mono-apache-server includes a
+ mono-server-update script that creates a configuration file for
+ apache to start the ASP.NET applications, and mono-server-update can
+ restart apache if there's a new configuration file
+ (/etc/mono-server/mono-server-hosts.conf). If this is true, then apache will be restarted when there is a new mono-server-hosts.conf file.
Property changes on: xsp/trunk/debian/mono-apache-server1.templates
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: xsp/trunk/debian/mono-fastcgi-server.README.Debian
===================================================================
--- xsp/trunk/debian/mono-fastcgi-server.README.Debian 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-fastcgi-server.README.Debian 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,25 +0,0 @@
-mono-fastcgi-server for Debian
---------------------------
-
-mod-fastcgi-server is a backend server that allows you to run ASP.NET web
-applications in conjunction with the FastCGI server of your choice, such as
-Lighttpd. In Debian, fastcgi-mono-server is provided in the package
-mono-fastcgi-server.
-
-fastcgi-mono-server creates a socket in /tmp, and FastCGI communicates with
-fastcgi-mono-server through that socket, in CGI format, using FastCGI records.
-
-So you need this package to use ASP.NET via FastCGI.
-
-In most cases, configuration of ASP.NET sites is handled via your HTTP server's
-configuration, rather than via fastcgi-mono-server itself. Therefore, no
-configuration files or examples have been included. Please see this link for
-general information on interaction between FastCGI and Mono:
-
-http://www.mono-project.com/FastCGI
-
-Please see this one for examples on configuration for Lighttpd:
-
-http://www.mono-project.com/FastCGI_Lighttpd
-
- -- Jo Shields <directhex at apebox.org>, Thu Jul 3 10:05:17 2008
Deleted: xsp/trunk/debian/mono-fastcgi-server.dirs
===================================================================
--- xsp/trunk/debian/mono-fastcgi-server.dirs 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-fastcgi-server.dirs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1 +0,0 @@
-usr/bin/
Deleted: xsp/trunk/debian/mono-fastcgi-server.docs
===================================================================
--- xsp/trunk/debian/mono-fastcgi-server.docs 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-fastcgi-server.docs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,3 +0,0 @@
-NEWS
-README
-AUTHORS
Deleted: xsp/trunk/debian/mono-fastcgi-server.install
===================================================================
--- xsp/trunk/debian/mono-fastcgi-server.install 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-fastcgi-server.install 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/mono/1.0/fastcgi-mono-server.exe
-debian/tmp/usr/lib/mono/gac/fastcgi-mono-server
-debian/tmp/usr/bin/fastcgi-mono-server
Added: xsp/trunk/debian/mono-fastcgi-server.links
===================================================================
--- xsp/trunk/debian/mono-fastcgi-server.links (rev 0)
+++ xsp/trunk/debian/mono-fastcgi-server.links 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,2 @@
+usr/bin/fastcgi-mono-server2 usr/bin/fastcgi-mono-server
+usr/share/man/man1/fastcgi-mono-server2.1 usr/share/man/man1/fastcgi-mono-server.1
Deleted: xsp/trunk/debian/mono-fastcgi-server.manpages
===================================================================
--- xsp/trunk/debian/mono-fastcgi-server.manpages 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-fastcgi-server.manpages 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1 +0,0 @@
-debian/tmp/usr/share/man/man1/fastcgi-mono-server.1
Copied: xsp/trunk/debian/mono-fastcgi-server1.README.Debian (from rev 3997, xsp/trunk/debian/mono-fastcgi-server.README.Debian)
===================================================================
--- xsp/trunk/debian/mono-fastcgi-server1.README.Debian (rev 0)
+++ xsp/trunk/debian/mono-fastcgi-server1.README.Debian 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,25 @@
+mono-fastcgi-server for Debian
+--------------------------
+
+mod-fastcgi-server is a backend server that allows you to run ASP.NET web
+applications in conjunction with the FastCGI server of your choice, such as
+Lighttpd. In Debian, fastcgi-mono-server is provided in the package
+mono-fastcgi-server.
+
+fastcgi-mono-server creates a socket in /tmp, and FastCGI communicates with
+fastcgi-mono-server through that socket, in CGI format, using FastCGI records.
+
+So you need this package to use ASP.NET via FastCGI.
+
+In most cases, configuration of ASP.NET sites is handled via your HTTP server's
+configuration, rather than via fastcgi-mono-server itself. Therefore, no
+configuration files or examples have been included. Please see this link for
+general information on interaction between FastCGI and Mono:
+
+http://www.mono-project.com/FastCGI
+
+Please see this one for examples on configuration for Lighttpd:
+
+http://www.mono-project.com/FastCGI_Lighttpd
+
+ -- Jo Shields <directhex at apebox.org>, Thu Jul 3 10:05:17 2008
Property changes on: xsp/trunk/debian/mono-fastcgi-server1.README.Debian
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-fastcgi-server1.dirs (from rev 3997, xsp/trunk/debian/mono-fastcgi-server.dirs)
===================================================================
--- xsp/trunk/debian/mono-fastcgi-server1.dirs (rev 0)
+++ xsp/trunk/debian/mono-fastcgi-server1.dirs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1 @@
+usr/bin/
Property changes on: xsp/trunk/debian/mono-fastcgi-server1.dirs
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-fastcgi-server1.docs (from rev 3997, xsp/trunk/debian/mono-fastcgi-server.docs)
===================================================================
--- xsp/trunk/debian/mono-fastcgi-server1.docs (rev 0)
+++ xsp/trunk/debian/mono-fastcgi-server1.docs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,3 @@
+NEWS
+README
+AUTHORS
Property changes on: xsp/trunk/debian/mono-fastcgi-server1.docs
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-fastcgi-server1.install (from rev 3997, xsp/trunk/debian/mono-fastcgi-server.install)
===================================================================
--- xsp/trunk/debian/mono-fastcgi-server1.install (rev 0)
+++ xsp/trunk/debian/mono-fastcgi-server1.install 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/mono/1.0/fastcgi-mono-server.exe
+debian/tmp/usr/lib/mono/gac/fastcgi-mono-server
+debian/tmp/usr/bin/fastcgi-mono-server1
Property changes on: xsp/trunk/debian/mono-fastcgi-server1.install
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-fastcgi-server1.manpages (from rev 3997, xsp/trunk/debian/mono-fastcgi-server.manpages)
===================================================================
--- xsp/trunk/debian/mono-fastcgi-server1.manpages (rev 0)
+++ xsp/trunk/debian/mono-fastcgi-server1.manpages 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/fastcgi-mono-server1.1
Property changes on: xsp/trunk/debian/mono-fastcgi-server1.manpages
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: xsp/trunk/debian/mono-xsp-base.install
===================================================================
--- xsp/trunk/debian/mono-xsp-base.install 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp-base.install 2009-06-14 23:55:53 UTC (rev 4001)
@@ -2,7 +2,7 @@
debian/tmp/usr/lib/mono/gac/Mono.WebServer
debian/tmp/usr/lib/pkgconfig/xsp.pc
debian/dh_installxsp /usr/bin
-debian/postrm-monoxsp /usr/share/debhelper/autoscripts
+debian/postrm-monoxsp1 /usr/share/debhelper/autoscripts
debian/postrm-monoxsp2 /usr/share/debhelper/autoscripts
-debian/postinst-monoxsp /usr/share/debhelper/autoscripts
+debian/postinst-monoxsp1 /usr/share/debhelper/autoscripts
debian/postinst-monoxsp2 /usr/share/debhelper/autoscripts
Modified: xsp/trunk/debian/mono-xsp-update.conf
===================================================================
--- xsp/trunk/debian/mono-xsp-update.conf 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp-update.conf 2009-06-14 23:55:53 UTC (rev 4001)
@@ -49,10 +49,10 @@
$monoxsp_dir = "/etc/xsp";
$monoxsp_confd = "$monoxsp_dir/conf.d";
$monoxsp_webapp = "$monoxsp_dir/debian.webapp";
-$daemon = "/etc/init.d/mono-xsp";
-$daemon_pid = "/var/run/mono-xsp.pid";
+$daemon = "/etc/init.d/mono-xsp1";
+$daemon_pid = "/var/run/mono-xsp1.pid";
$applications = "";
-$default_file = "/etc/default/mono-xsp";
+$default_file = "/etc/default/mono-xsp1";
my $restart = "yes";
my $first_file = "yes";
Deleted: xsp/trunk/debian/mono-xsp.README.Debian
===================================================================
--- xsp/trunk/debian/mono-xsp.README.Debian 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.README.Debian 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,45 +0,0 @@
-xsp for Debian
---------------
-
-The mono-xsp package contains a standalone WebServer to run ASP.NET, developed
-by the Mono hackers, it should run in port 8080 or 8081, the scripts detects which port
-to use.
-
-For example, if you have a mail proxy (or http proxy) using 8080 it should run in 8081.
-
-To change the port, you need to kill your http/mail proxy or move them to other port, and then
-reconfigure xsp as root:
-
-# dpkg-reconfigure mono-xsp
-
-The way that xsp manage the /alias (virtual hosts) is like exim does. We have a directory in
-/etc called xsp, inside it we have a conf.d directory, were we have directories for each
-'virtualhost'.
-
-For example, we have monodoc-http, so we have:
-
-/etc/xsp <- Mono XSP Config Dir
-/etc/xsp/conf.d <- Mono XSP VirtualHosts Config Directories
-/etc/xsp/conf.d/monodoc <- MonoDoc Config Files for XSP
-
-Every file is marked by a number, an underscore and the alias name, for example:
-
-/etc/xsp/conf.d/monodoc/10_monodochttp
-
-If you want to install a new virtualhost to XSP, you just need to apt-get it, and if
-XSP is running it should be started normally, if it's the first virtualhost and you configured
-mono-xsp to be started automatically it will start xsp by default.
-
-If you configured mono-xsp to NOT be started automatically, you should start mono-xsp manually:
-
-/etc/init.d/mono-xsp start
-
-Also, if you are installing YOUR OWN VirtualHost, you should use mono-xsp-admin.conf (and also the manpage)
-
-NOTE: In some cases you can find that /etc/mono-server|/etc/xsp exists with other virtualhosts and you
-don't have mono-server|mono-xsp installed, don't get in panic, some virtualhosts installs host configuration
-files in both server (xsp and mono-server).
-
-Happy Hacking
-
- -- Pablo Fischer <pablo at pablo.com.mx>, Mon, 15 Mar 2004 18:52:30 -0600
Deleted: xsp/trunk/debian/mono-xsp.config
===================================================================
--- xsp/trunk/debian/mono-xsp.config 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.config 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,72 +0,0 @@
-#!/bin/bash -e
-
-# Initialization
-. /usr/share/debconf/confmodule
-db_version 2.0
-db_capb backup
-db_title XSP WebServer
-
-# Autostart
-STATE=1
-while [ "$STATE" != 0 -a "$STATE" != 2 ]; do
- case "$STATE" in
- 1)
- db_input medium xsp/xsp_autostart || true
- if db_go; then
- db_get xsp/xsp_autostart || true
- if [ "$RET" = "true" ]; then
- STATE=2
- else
- db_set xsp/xsp_autostart false || true
- STATE=2
- fi
- else
- STATE=0
- fi
- ;;
- esac
-done
-
-if [ "$STATE" = 0 ]; then
- exit 1
-fi
-
-# Bind
-STATE=1
-while [ "$STATE" != 0 -a "$STATE" != 2 ]; do
- case "$STATE" in
- 1)
- db_input medium xsp/xsp_bind || true
- if db_go; then
- db_get xsp/xsp_bind || true
- STATE=2
- else
- STATE=0
- fi
- ;;
- esac
-done
-
-if [ "$STATE" = 0 ]; then
- exit 1
-fi
-
-# Port
-STATE=1
-while [ "$STATE" != 0 -a "$STATE" != 2 ]; do
- case "$STATE" in
- 1)
- db_input medium xsp/xsp_port || true
- if db_go; then
- db_get xsp/xsp_port || true
- STATE=2
- else
- STATE=0
- fi
- ;;
- esac
-done
-
-if [ "$STATE" = 0 ]; then
- exit 1
-fi
Deleted: xsp/trunk/debian/mono-xsp.default
===================================================================
--- xsp/trunk/debian/mono-xsp.default 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.default 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,13 +0,0 @@
-# Defaults for mono-xsp, official version
-# sourced by /etc/init.d/mono-xsp
-
-# User and group by default
-user=www-data
-group=www-data
-
-# Default port
-port=8080
-address=0.0.0.0
-
-# Directory for config files
-config_files=/etc/xsp
Deleted: xsp/trunk/debian/mono-xsp.dirs
===================================================================
--- xsp/trunk/debian/mono-xsp.dirs 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.dirs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,4 +0,0 @@
-usr/bin
-etc/xsp
-etc/xsp/conf.d
-var/run/mono-xsp
Deleted: xsp/trunk/debian/mono-xsp.docs
===================================================================
--- xsp/trunk/debian/mono-xsp.docs 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.docs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,3 +0,0 @@
-NEWS
-README
-AUTHORS
Deleted: xsp/trunk/debian/mono-xsp.init
===================================================================
--- xsp/trunk/debian/mono-xsp.init 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.init 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,97 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides: mono-xsp
-# Required-Start:
-# Required-Stop:
-# Should-Start:
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Mono XSP
-# Description: Debian init script for Mono XSP.
-### END INIT INFO
-#
-# Written by Pablo Fischer <pablo at pablo.com.mx>
-# Dylan R. E. Moonfire <debian at mfgames.com>
-# Modified for Debian GNU/Linux
-#
-# Version: @(#)mono-xsp pablo at pablo.com.mx
-#
-
-# Variables
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/xsp
-NAME=mono-xsp
-DESC="XSP WebServer"
-DEFAULT=/etc/default/$NAME
-CFGDIR=/etc/xsp
-VIRTUALFILE=$CFGDIR/debian.webapp
-MONO_SHARED_DIR=/var/run/$NAME
-
-# Use LSB
-. /lib/lsb/init-functions
-
-# If we don't have the basics, don't bother
-test -x $DAEMON || exit 0
-test -f $DEFAULT && . $DEFAULT
-
-if [ ! -e $MONO_SHARED_DIR ]; then
- mkdir $MONO_SHARED_DIR
- chown $user:$group $MONO_SHARED_DIR
-fi
-
-should_start() {
- if [ ! -e $VIRTUALFILE -o `cat $VIRTUALFILE | wc -l` = "2" ]; then
- log_action_msg "You have an incomplete $VIRTUALFILE"
- log_action_msg "To fix it, you need to install at least one package for xsp (like asp.net-examples)"
- return 1
- fi
-
- if [ -f /var/run/$NAME.pid ]; then
- # Are we really running xsp?
- xsp_pid=`cat /var/run/$NAME.pid`
- xsp_ps=`ps -p $xsp_pid | wc -l`
- if [ "$xsp_ps" != "1" ]; then
- log_action_msg "Sorry, there is already a xsp running, stop it first"
- return 1
- fi
- fi
-
- return 0
-
-}
-
-case "$1" in
- start)
- if should_start ; then
- log_daemon_msg "Starting $DESC" "$NAME"
- export MONO_SHARED_DIR
- start-stop-daemon --start --background --make-pidfile \
- --quiet --pidfile /var/run/$NAME.pid \
- --user $user --group $group --chuid $user \
- --exec $DAEMON -- \
- --port $port --address $address --appconfigdir \
- $CFGDIR --nonstop
- log_end_msg $?
- fi
- ;;
- stop)
- log_daemon_msg "Stopping $DESC" "$NAME"
- for i in $(ps aux | grep -v grep | grep 'xsp.exe' | cut -c 10-15)
- do
- kill $i > /dev/null 2>&1
- done
- log_end_msg $?
- ;;
- restart|force-reload)
- $0 stop
- $0 start
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
Deleted: xsp/trunk/debian/mono-xsp.install
===================================================================
--- xsp/trunk/debian/mono-xsp.install 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.install 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,11 +0,0 @@
-debian/tmp/usr/bin/asp-state
-debian/tmp/usr/bin/dbsessmgr
-debian/tmp/usr/bin/xsp
-debian/tmp/usr/lib/xsp/1.0/asp-state.exe
-debian/tmp/usr/lib/xsp/1.0/asp-state.exe.config
-debian/tmp/usr/lib/xsp/1.0/dbsessmgr.exe
-debian/tmp/usr/lib/xsp/1.0/dbsessmgr.exe.config
-debian/tmp/usr/lib/mono/1.0/xsp.exe
-debian/tmp/usr/lib/mono/gac/xsp
-debian/tmp/usr/sbin/mono-xsp-update
-debian/tmp/usr/sbin/mono-xsp-admin
Added: xsp/trunk/debian/mono-xsp.links
===================================================================
--- xsp/trunk/debian/mono-xsp.links (rev 0)
+++ xsp/trunk/debian/mono-xsp.links 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,7 @@
+usr/bin/asp-state2 usr/bin/asp-state
+usr/bin/dbsessmgr2 usr/bin/dbsessmgr
+usr/bin/xsp2 usr/bin/xsp
+usr/share/man/man1/xsp2.1 usr/share/man/man1/xsp.1
+usr/share/man/man1/dbsessmgr2.1 usr/share/man/man1/dbsessmgr.1
+usr/share/man/man1/asp-state2.1 usr/share/man/man1/asp-state.1
+
Deleted: xsp/trunk/debian/mono-xsp.manpages
===================================================================
--- xsp/trunk/debian/mono-xsp.manpages 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.manpages 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,6 +0,0 @@
-debian/mono-xsp-update.8
-debian/mono-xsp-admin.8
-debian/update-mono-xsp.8
-man/xsp.1
-man/dbsessmgr.1
-man/asp-state.1
Deleted: xsp/trunk/debian/mono-xsp.postinst
===================================================================
--- xsp/trunk/debian/mono-xsp.postinst 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.postinst 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,98 +0,0 @@
-#!/bin/bash
-set -e
-
-. /usr/share/debconf/confmodule
-db_version 2.0
-
-xsp_default="/etc/default/mono-xsp"
-NAME=mono-xsp
-DESC="XSP WebServer"
-CFGDIR=/etc/xsp
-VIRTUALFILE=$CFGDIR/debian.webapp
-
-update_port() {
- db_get xsp/xsp_port || true
- R=$RET
- echo "Using Mono XSP port: $R"
- sed "s/port=.*/port=$R/g" $xsp_default > $tempfile
- cp $tempfile $xsp_default
-}
-
-update_bind() {
- db_get xsp/xsp_bind || true
- R=$RET
- echo "Binding Mono XSP address: $R"
- sed "s/address=.*/address=$R/g" $xsp_default > $tempfile
- cp $tempfile $xsp_default
-}
-
-should_start() {
- if [ -e $xsp_default ]; then
- . $xsp_default
- if [ "$start_boot" != "true" ]; then
- return 1
- fi
- fi
-
- if [ ! -e $VIRTUALFILE -o `cat $VIRTUALFILE | wc -l` = "2" ]; then
- echo "mono-xsp: Not started, you need asp.net-examples/monodoc-http or an ASP.NET application"
- return 1
- fi
-
- if [ -f /var/run/$NAME.pid ]; then
- # Are we really running xsp?
- xsp_pid=`cat /var/run/$NAME.pid`
- xsp_ps=`ps -p $xsp_pid | wc -l`
- if [ "$xsp_ps" != "2" ]; then
- return 0
- else
- return 1
- fi
- else
- return 1
- fi
-
- return 1
-
-}
-
-case "$1" in
- configure)
- tempfile=$(/bin/tempfile)
-
- # Configure autostart, but don't prevent the init script
- # from starting it manually.
- autostart="true"
- db_get xsp/xsp_autostart || true
- if [ "$RET" = "true" ]; then
- if [ -x "/etc/init.d/mono-xsp" ]; then
- update-rc.d mono-xsp defaults > /dev/null 2>&1 || true
- fi
- else
- update-rc.d -f mono-xsp remove > /dev/null 2>&1 || true
- fi
-
- # Configure the port and address
- update_port
- update_bind
-
- # chmod the working directories
- chown -R www-data:www-data /var/run/mono-xsp
- mono-xsp-update
- if [ "$RET" = "true" ]; then
- if should_start -a $autostart = "true" ; then
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d mono-xsp start
- else
- /etc/init.d/mono-xsp start
- fi
- fi
- fi
-
- rm $tempfile
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: xsp/trunk/debian/mono-xsp.postrm
===================================================================
--- xsp/trunk/debian/mono-xsp.postrm 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.postrm 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = "purge" ]; then
- rm -f /etc/xsp/debian.webapp
- #update-rc.d
- update-rc.d -f mono-xsp remove > /dev/null 2>&1
-fi
-
-#DEBHELPER#
-
-exit 0
Deleted: xsp/trunk/debian/mono-xsp.preinst
===================================================================
--- xsp/trunk/debian/mono-xsp.preinst 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.preinst 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e
-
-NAME=mono-xsp
-DESC="XSP WebServer"
-
-case "$1" in
- upgrade|install)
- if [ -f /etc/init.d/mono-xsp ]; then
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d mono-xsp stop
- else
- /etc/init.d/mono-xsp stop
- fi
- fi
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: xsp/trunk/debian/mono-xsp.prerm
===================================================================
--- xsp/trunk/debian/mono-xsp.prerm 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.prerm 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,38 +0,0 @@
-#!/bin/sh -e
-
-NAME=mono-xsp
-DESC="XSP WebServer"
-
-#0 : false
-#1 : true
-should_stop() {
- if [ -f /var/run/$NAME.pid ]; then
- # Are we really running xsp?
- xsp_pid=`cat /var/run/$NAME.pid`
- xsp_ps=`ps -p $xsp_pid | wc -l`
- # Are there any process running by that pid?
- if [ "$xsp_ps" = "2" ]; then
- return 0
- else
- return 1
- fi
- fi
- return 0
-}
-
-case "$1" in
- remove)
- # should we stop the server?
- if should_stop ; then
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d mono-xsp stop
- else
- /etc/init.d/mono-xsp stop
- fi
- fi
- ;;
- esac
-
-#DEBHELPER#
-
-exit 0
Deleted: xsp/trunk/debian/mono-xsp.templates
===================================================================
--- xsp/trunk/debian/mono-xsp.templates 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp.templates 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,22 +0,0 @@
-Template: xsp/xsp_autostart
-Type: boolean
-Default: true
-_Description: Start on boot?
- If this is true, then XSP will automatically start when the computer
- is turned on.
-
-Template: xsp/xsp_bind
-Type: string
-Default: 0.0.0.0
-_Description: Bind to address:
- To function properly, XSP needs to be bound to an IP address. The
- default ("0.0.0.0") binds to all addresses of the server, but a
- specific port can be selected. To use XSP only locally, use
- "127.0.0.1" for the address.
-
-Template: xsp/xsp_port
-Type: string
-Default: 8081
-_Description: Bind to port:
- XSP is bound to a specific port on the server. Common values are 80,
- 8080, or 8081.
Copied: xsp/trunk/debian/mono-xsp1.README.Debian (from rev 3997, xsp/trunk/debian/mono-xsp.README.Debian)
===================================================================
--- xsp/trunk/debian/mono-xsp1.README.Debian (rev 0)
+++ xsp/trunk/debian/mono-xsp1.README.Debian 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,45 @@
+xsp for Debian
+--------------
+
+The mono-xsp package contains a standalone WebServer to run ASP.NET, developed
+by the Mono hackers, it should run in port 8080 or 8081, the scripts detects which port
+to use.
+
+For example, if you have a mail proxy (or http proxy) using 8080 it should run in 8081.
+
+To change the port, you need to kill your http/mail proxy or move them to other port, and then
+reconfigure xsp as root:
+
+# dpkg-reconfigure mono-xsp
+
+The way that xsp manage the /alias (virtual hosts) is like exim does. We have a directory in
+/etc called xsp, inside it we have a conf.d directory, were we have directories for each
+'virtualhost'.
+
+For example, we have monodoc-http, so we have:
+
+/etc/xsp <- Mono XSP Config Dir
+/etc/xsp/conf.d <- Mono XSP VirtualHosts Config Directories
+/etc/xsp/conf.d/monodoc <- MonoDoc Config Files for XSP
+
+Every file is marked by a number, an underscore and the alias name, for example:
+
+/etc/xsp/conf.d/monodoc/10_monodochttp
+
+If you want to install a new virtualhost to XSP, you just need to apt-get it, and if
+XSP is running it should be started normally, if it's the first virtualhost and you configured
+mono-xsp to be started automatically it will start xsp by default.
+
+If you configured mono-xsp to NOT be started automatically, you should start mono-xsp manually:
+
+/etc/init.d/mono-xsp start
+
+Also, if you are installing YOUR OWN VirtualHost, you should use mono-xsp-admin.conf (and also the manpage)
+
+NOTE: In some cases you can find that /etc/mono-server|/etc/xsp exists with other virtualhosts and you
+don't have mono-server|mono-xsp installed, don't get in panic, some virtualhosts installs host configuration
+files in both server (xsp and mono-server).
+
+Happy Hacking
+
+ -- Pablo Fischer <pablo at pablo.com.mx>, Mon, 15 Mar 2004 18:52:30 -0600
Property changes on: xsp/trunk/debian/mono-xsp1.README.Debian
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.config (from rev 3997, xsp/trunk/debian/mono-xsp.config)
===================================================================
--- xsp/trunk/debian/mono-xsp1.config (rev 0)
+++ xsp/trunk/debian/mono-xsp1.config 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,72 @@
+#!/bin/bash -e
+
+# Initialization
+. /usr/share/debconf/confmodule
+db_version 2.0
+db_capb backup
+db_title XSP WebServer
+
+# Autostart
+STATE=1
+while [ "$STATE" != 0 -a "$STATE" != 2 ]; do
+ case "$STATE" in
+ 1)
+ db_input medium xsp/xsp_autostart || true
+ if db_go; then
+ db_get xsp/xsp_autostart || true
+ if [ "$RET" = "true" ]; then
+ STATE=2
+ else
+ db_set xsp/xsp_autostart false || true
+ STATE=2
+ fi
+ else
+ STATE=0
+ fi
+ ;;
+ esac
+done
+
+if [ "$STATE" = 0 ]; then
+ exit 1
+fi
+
+# Bind
+STATE=1
+while [ "$STATE" != 0 -a "$STATE" != 2 ]; do
+ case "$STATE" in
+ 1)
+ db_input medium xsp/xsp_bind || true
+ if db_go; then
+ db_get xsp/xsp_bind || true
+ STATE=2
+ else
+ STATE=0
+ fi
+ ;;
+ esac
+done
+
+if [ "$STATE" = 0 ]; then
+ exit 1
+fi
+
+# Port
+STATE=1
+while [ "$STATE" != 0 -a "$STATE" != 2 ]; do
+ case "$STATE" in
+ 1)
+ db_input medium xsp/xsp_port || true
+ if db_go; then
+ db_get xsp/xsp_port || true
+ STATE=2
+ else
+ STATE=0
+ fi
+ ;;
+ esac
+done
+
+if [ "$STATE" = 0 ]; then
+ exit 1
+fi
Property changes on: xsp/trunk/debian/mono-xsp1.config
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.default (from rev 3997, xsp/trunk/debian/mono-xsp.default)
===================================================================
--- xsp/trunk/debian/mono-xsp1.default (rev 0)
+++ xsp/trunk/debian/mono-xsp1.default 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,13 @@
+# Defaults for mono-xsp, official version
+# sourced by /etc/init.d/mono-xsp
+
+# User and group by default
+user=www-data
+group=www-data
+
+# Default port
+port=8080
+address=0.0.0.0
+
+# Directory for config files
+config_files=/etc/xsp
Property changes on: xsp/trunk/debian/mono-xsp1.default
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.dirs (from rev 3997, xsp/trunk/debian/mono-xsp.dirs)
===================================================================
--- xsp/trunk/debian/mono-xsp1.dirs (rev 0)
+++ xsp/trunk/debian/mono-xsp1.dirs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,4 @@
+usr/bin
+etc/xsp
+etc/xsp/conf.d
+var/run/mono-xsp1
Property changes on: xsp/trunk/debian/mono-xsp1.dirs
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.docs (from rev 3997, xsp/trunk/debian/mono-xsp.docs)
===================================================================
--- xsp/trunk/debian/mono-xsp1.docs (rev 0)
+++ xsp/trunk/debian/mono-xsp1.docs 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,3 @@
+NEWS
+README
+AUTHORS
Property changes on: xsp/trunk/debian/mono-xsp1.docs
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.init (from rev 3997, xsp/trunk/debian/mono-xsp.init)
===================================================================
--- xsp/trunk/debian/mono-xsp1.init (rev 0)
+++ xsp/trunk/debian/mono-xsp1.init 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,97 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: mono-xsp
+# Required-Start:
+# Required-Stop:
+# Should-Start:
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Mono XSP
+# Description: Debian init script for Mono XSP.
+### END INIT INFO
+#
+# Written by Pablo Fischer <pablo at pablo.com.mx>
+# Dylan R. E. Moonfire <debian at mfgames.com>
+# Modified for Debian GNU/Linux
+#
+# Version: @(#)mono-xsp pablo at pablo.com.mx
+#
+
+# Variables
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/xsp1
+NAME=mono-xsp1
+DESC="XSP 1.1 WebServer"
+DEFAULT=/etc/default/$NAME
+CFGDIR=/etc/xsp
+VIRTUALFILE=$CFGDIR/debian.webapp
+MONO_SHARED_DIR=/var/run/$NAME
+
+# Use LSB
+. /lib/lsb/init-functions
+
+# If we don't have the basics, don't bother
+test -x $DAEMON || exit 0
+test -f $DEFAULT && . $DEFAULT
+
+if [ ! -e $MONO_SHARED_DIR ]; then
+ mkdir $MONO_SHARED_DIR
+ chown $user:$group $MONO_SHARED_DIR
+fi
+
+should_start() {
+ if [ ! -e $VIRTUALFILE -o `cat $VIRTUALFILE | wc -l` = "2" ]; then
+ log_action_msg "You have an incomplete $VIRTUALFILE"
+ log_action_msg "To fix it, you need to install at least one package for xsp (like asp.net-examples)"
+ return 1
+ fi
+
+ if [ -f /var/run/$NAME.pid ]; then
+ # Are we really running xsp?
+ xsp_pid=`cat /var/run/$NAME.pid`
+ xsp_ps=`ps -p $xsp_pid | wc -l`
+ if [ "$xsp_ps" != "1" ]; then
+ log_action_msg "Sorry, there is already a xsp running, stop it first"
+ return 1
+ fi
+ fi
+
+ return 0
+
+}
+
+case "$1" in
+ start)
+ if should_start ; then
+ log_daemon_msg "Starting $DESC" "$NAME"
+ export MONO_SHARED_DIR
+ start-stop-daemon --start --background --make-pidfile \
+ --quiet --pidfile /var/run/$NAME.pid \
+ --user $user --group $group --chuid $user \
+ --exec $DAEMON -- \
+ --port $port --address $address --appconfigdir \
+ $CFGDIR --nonstop
+ log_end_msg $?
+ fi
+ ;;
+ stop)
+ log_daemon_msg "Stopping $DESC" "$NAME"
+ for i in $(ps aux | grep -v grep | grep 'xsp.exe' | cut -c 10-15)
+ do
+ kill $i > /dev/null 2>&1
+ done
+ log_end_msg $?
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Property changes on: xsp/trunk/debian/mono-xsp1.init
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.install (from rev 3997, xsp/trunk/debian/mono-xsp.install)
===================================================================
--- xsp/trunk/debian/mono-xsp1.install (rev 0)
+++ xsp/trunk/debian/mono-xsp1.install 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,11 @@
+debian/tmp/usr/bin/asp-state1
+debian/tmp/usr/bin/dbsessmgr1
+debian/tmp/usr/bin/xsp1
+debian/tmp/usr/lib/xsp/1.0/asp-state.exe
+debian/tmp/usr/lib/xsp/1.0/asp-state.exe.config
+debian/tmp/usr/lib/xsp/1.0/dbsessmgr.exe
+debian/tmp/usr/lib/xsp/1.0/dbsessmgr.exe.config
+debian/tmp/usr/lib/mono/1.0/xsp.exe
+debian/tmp/usr/lib/mono/gac/xsp
+debian/tmp/usr/sbin/mono-xsp-update
+debian/tmp/usr/sbin/mono-xsp-admin
Property changes on: xsp/trunk/debian/mono-xsp1.install
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.manpages (from rev 3997, xsp/trunk/debian/mono-xsp.manpages)
===================================================================
--- xsp/trunk/debian/mono-xsp1.manpages (rev 0)
+++ xsp/trunk/debian/mono-xsp1.manpages 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,6 @@
+debian/mono-xsp-update.8
+debian/mono-xsp-admin.8
+debian/update-mono-xsp.8
+debian/tmp/usr/share/man/man1/xsp1.1
+debian/tmp/usr/share/man/man1/dbsessmgr1.1
+debian/tmp/usr/share/man/man1/asp-state1.1
Property changes on: xsp/trunk/debian/mono-xsp1.manpages
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.postinst (from rev 3997, xsp/trunk/debian/mono-xsp.postinst)
===================================================================
--- xsp/trunk/debian/mono-xsp1.postinst (rev 0)
+++ xsp/trunk/debian/mono-xsp1.postinst 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,98 @@
+#!/bin/bash
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+xsp_default="/etc/default/mono-xsp1"
+NAME=mono-xsp1
+DESC="XSP 1.1 WebServer"
+CFGDIR=/etc/xsp
+VIRTUALFILE=$CFGDIR/debian.webapp
+
+update_port() {
+ db_get xsp/xsp_port || true
+ R=$RET
+ echo "Using Mono XSP 1.1 port: $R"
+ sed "s/port=.*/port=$R/g" $xsp_default > $tempfile
+ cp $tempfile $xsp_default
+}
+
+update_bind() {
+ db_get xsp/xsp_bind || true
+ R=$RET
+ echo "Binding Mono XSP 1.1 address: $R"
+ sed "s/address=.*/address=$R/g" $xsp_default > $tempfile
+ cp $tempfile $xsp_default
+}
+
+should_start() {
+ if [ -e $xsp_default ]; then
+ . $xsp_default
+ if [ "$start_boot" != "true" ]; then
+ return 1
+ fi
+ fi
+
+ if [ ! -e $VIRTUALFILE -o `cat $VIRTUALFILE | wc -l` = "2" ]; then
+ echo "mono-xsp1: Not started, you need asp.net-examples/monodoc-http or an ASP.NET application"
+ return 1
+ fi
+
+ if [ -f /var/run/$NAME.pid ]; then
+ # Are we really running xsp?
+ xsp_pid=`cat /var/run/$NAME.pid`
+ xsp_ps=`ps -p $xsp_pid | wc -l`
+ if [ "$xsp_ps" != "2" ]; then
+ return 0
+ else
+ return 1
+ fi
+ else
+ return 1
+ fi
+
+ return 1
+
+}
+
+case "$1" in
+ configure)
+ tempfile=$(/bin/tempfile)
+
+ # Configure autostart, but don't prevent the init script
+ # from starting it manually.
+ autostart="true"
+ db_get xsp/xsp_autostart || true
+ if [ "$RET" = "true" ]; then
+ if [ -x "/etc/init.d/mono-xsp1" ]; then
+ update-rc.d mono-xsp1 defaults > /dev/null 2>&1 || true
+ fi
+ else
+ update-rc.d -f mono-xsp1 remove > /dev/null 2>&1 || true
+ fi
+
+ # Configure the port and address
+ update_port
+ update_bind
+
+ # chmod the working directories
+ chown -R www-data:www-data /var/run/mono-xsp1
+ mono-xsp-update
+ if [ "$RET" = "true" ]; then
+ if should_start -a $autostart = "true" ; then
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d mono-xsp1 start
+ else
+ /etc/init.d/mono-xsp1 start
+ fi
+ fi
+ fi
+
+ rm $tempfile
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Property changes on: xsp/trunk/debian/mono-xsp1.postinst
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.postrm (from rev 3997, xsp/trunk/debian/mono-xsp.postrm)
===================================================================
--- xsp/trunk/debian/mono-xsp1.postrm (rev 0)
+++ xsp/trunk/debian/mono-xsp1.postrm 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "purge" ]; then
+ rm -f /etc/xsp/debian.webapp
+ #update-rc.d
+ update-rc.d -f mono-xsp1 remove > /dev/null 2>&1
+fi
+
+#DEBHELPER#
+
+exit 0
Property changes on: xsp/trunk/debian/mono-xsp1.postrm
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.preinst (from rev 3997, xsp/trunk/debian/mono-xsp.preinst)
===================================================================
--- xsp/trunk/debian/mono-xsp1.preinst (rev 0)
+++ xsp/trunk/debian/mono-xsp1.preinst 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+NAME=mono-xsp1
+DESC="XSP 1.1 WebServer"
+
+case "$1" in
+ upgrade|install)
+ if [ -f /etc/init.d/mono-xsp1 ]; then
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d mono-xsp1 stop
+ else
+ /etc/init.d/mono-xsp1 stop
+ fi
+ fi
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Property changes on: xsp/trunk/debian/mono-xsp1.preinst
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.prerm (from rev 3997, xsp/trunk/debian/mono-xsp.prerm)
===================================================================
--- xsp/trunk/debian/mono-xsp1.prerm (rev 0)
+++ xsp/trunk/debian/mono-xsp1.prerm 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,38 @@
+#!/bin/sh -e
+
+NAME=mono-xsp1
+DESC="XSP 1.1 WebServer"
+
+#0 : false
+#1 : true
+should_stop() {
+ if [ -f /var/run/$NAME.pid ]; then
+ # Are we really running xsp?
+ xsp_pid=`cat /var/run/$NAME.pid`
+ xsp_ps=`ps -p $xsp_pid | wc -l`
+ # Are there any process running by that pid?
+ if [ "$xsp_ps" = "2" ]; then
+ return 0
+ else
+ return 1
+ fi
+ fi
+ return 0
+}
+
+case "$1" in
+ remove)
+ # should we stop the server?
+ if should_stop ; then
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d mono-xsp1 stop
+ else
+ /etc/init.d/mono-xsp1 stop
+ fi
+ fi
+ ;;
+ esac
+
+#DEBHELPER#
+
+exit 0
Property changes on: xsp/trunk/debian/mono-xsp1.prerm
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: xsp/trunk/debian/mono-xsp1.templates (from rev 3997, xsp/trunk/debian/mono-xsp.templates)
===================================================================
--- xsp/trunk/debian/mono-xsp1.templates (rev 0)
+++ xsp/trunk/debian/mono-xsp1.templates 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,22 @@
+Template: xsp/xsp_autostart
+Type: boolean
+Default: true
+_Description: Start on boot?
+ If this is true, then XSP will automatically start when the computer
+ is turned on.
+
+Template: xsp/xsp_bind
+Type: string
+Default: 0.0.0.0
+_Description: Bind to address:
+ To function properly, XSP needs to be bound to an IP address. The
+ default ("0.0.0.0") binds to all addresses of the server, but a
+ specific port can be selected. To use XSP only locally, use
+ "127.0.0.1" for the address.
+
+Template: xsp/xsp_port
+Type: string
+Default: 8081
+_Description: Bind to port:
+ XSP is bound to a specific port on the server. Common values are 80,
+ 8080, or 8081.
Property changes on: xsp/trunk/debian/mono-xsp1.templates
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: xsp/trunk/debian/mono-xsp2.init
===================================================================
--- xsp/trunk/debian/mono-xsp2.init 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/mono-xsp2.init 2009-06-14 23:55:53 UTC (rev 4001)
@@ -22,7 +22,7 @@
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/bin/xsp2
NAME=mono-xsp2
-DESC="XSP 2 WebServer"
+DESC="XSP 2.0 WebServer"
DEFAULT=/etc/default/$NAME
CFGDIR=/etc/xsp2
VIRTUALFILE=$CFGDIR/debian.webapp
@@ -43,7 +43,7 @@
should_start() {
if [ ! -e $VIRTUALFILE -o `cat $VIRTUALFILE | wc -l` = "2" ]; then
log_action_msg "You have an incomplete $VIRTUALFILE"
- log_action_msg "To fix it, you need to install at least one package for xsp2 (like asp.net-examples)"
+ log_action_msg "To fix it, you need to install at least one package for xsp2 (like asp.net2-examples)"
return 1
fi
Modified: xsp/trunk/debian/po/POTFILES.in
===================================================================
--- xsp/trunk/debian/po/POTFILES.in 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/po/POTFILES.in 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,3 +1,4 @@
-[type: gettext/rfc822deb] mono-apache-server.templates
-[type: gettext/rfc822deb] mono-xsp.templates
+[type: gettext/rfc822deb] mono-apache-server1.templates
+[type: gettext/rfc822deb] mono-apache-server2.templates
+[type: gettext/rfc822deb] mono-xsp1.templates
[type: gettext/rfc822deb] mono-xsp2.templates
Deleted: xsp/trunk/debian/postinst-monoxsp
===================================================================
--- xsp/trunk/debian/postinst-monoxsp 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/postinst-monoxsp 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,8 +0,0 @@
-if [ "$1" = "configure" ]; then
- if [ -x /usr/sbin/mono-xsp-update ]; then
- /usr/sbin/mono-xsp-update || true
- fi
- if [ -x /usr/sbin/mono-server-update ]; then
- /usr/sbin/mono-server-update || true
- fi
-fi
Copied: xsp/trunk/debian/postinst-monoxsp1 (from rev 3997, xsp/trunk/debian/postinst-monoxsp)
===================================================================
--- xsp/trunk/debian/postinst-monoxsp1 (rev 0)
+++ xsp/trunk/debian/postinst-monoxsp1 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,8 @@
+if [ "$1" = "configure" ]; then
+ if [ -x /usr/sbin/mono-xsp-update ]; then
+ /usr/sbin/mono-xsp-update || true
+ fi
+ if [ -x /usr/sbin/mono-server-update ]; then
+ /usr/sbin/mono-server-update || true
+ fi
+fi
Property changes on: xsp/trunk/debian/postinst-monoxsp1
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: xsp/trunk/debian/postrm-monoxsp
===================================================================
--- xsp/trunk/debian/postrm-monoxsp 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/postrm-monoxsp 2009-06-14 23:55:53 UTC (rev 4001)
@@ -1,9 +0,0 @@
-if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
- if [ -x /usr/sbin/mono-xsp-update ]; then
- /usr/sbin/mono-xsp-update || true
- fi
- if [ -x /usr/sbin/mono-server-update ]; then
- /usr/sbin/mono-server-update || true
- fi
-fi
-
Copied: xsp/trunk/debian/postrm-monoxsp1 (from rev 3997, xsp/trunk/debian/postrm-monoxsp)
===================================================================
--- xsp/trunk/debian/postrm-monoxsp1 (rev 0)
+++ xsp/trunk/debian/postrm-monoxsp1 2009-06-14 23:55:53 UTC (rev 4001)
@@ -0,0 +1,9 @@
+if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
+ if [ -x /usr/sbin/mono-xsp-update ]; then
+ /usr/sbin/mono-xsp-update || true
+ fi
+ if [ -x /usr/sbin/mono-server-update ]; then
+ /usr/sbin/mono-server-update || true
+ fi
+fi
+
Property changes on: xsp/trunk/debian/postrm-monoxsp1
___________________________________________________________________
Added: svn:mergeinfo
+
Modified: xsp/trunk/debian/rules
===================================================================
--- xsp/trunk/debian/rules 2009-06-10 18:42:45 UTC (rev 4000)
+++ xsp/trunk/debian/rules 2009-06-14 23:55:53 UTC (rev 4001)
@@ -21,16 +21,14 @@
PKG_VERSION ?= $(shell echo $(DPKG_VERSION) | cut -f 1 -d '-' | cut -f 1-3 -d '.')
NEXT_PKG_VERSION ?= $(shell echo $(PKG_VERSION) | perl -e '$$_=<>;/\.(\d+)$$/;$$a=$$1+1;s/\.(\d+)$$/.$$a/;print;')
-include /usr/share/dpatch/dpatch.make
-
configure: configure-stamp templates.pot
-configure-stamp: patch-stamp
+configure-stamp:
dh_testdir
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
touch configure-stamp
-build: patch-stamp build-stamp
+build: build-stamp
build-stamp: configure-stamp
dh_testdir
# Add here commands to compile the package.
@@ -69,7 +67,7 @@
templates.pot: $(wildcard debian/*.templates)
debconf-updatepo
-clean: clean-patched unpatch
+clean: clean-patched
clean-patched:
dh_testdir
dh_testroot
@@ -81,6 +79,10 @@
rm -f $(CURDIR)/debian/*.8 $(CURDIR)/debian/*.1
debconf-updatepo
rm -f build-stamp configure-stamp config.status
+ find . -name "*.exe" -exec rm {} \;
+ find . -name "*.exe.mdb" -exec rm {} \;
+ find . -name "*.dll" -exec rm {} \;
+ find . -name "*.dll.mdb" -exec rm {} \;
dh_clean
install: build
@@ -105,18 +107,23 @@
cat debian/tmp/usr/share/man/man1/xsp.1 \
| sed 's/xsp/xsp2/g' \
> debian/tmp/usr/share/man/man1/xsp2.1
+ cp debian/tmp/usr/share/man/man1/xsp.1 debian/tmp/usr/share/man/man1/xsp1.1
cat debian/tmp/usr/share/man/man1/dbsessmgr.1 \
| sed 's/dbsessmgr/dbsessmgr2/g' \
> debian/tmp/usr/share/man/man1/dbsessmgr2.1
+ cp debian/tmp/usr/share/man/man1/dbsessmgr.1 debian/tmp/usr/share/man/man1/dbsessmgr1.1
cat debian/tmp/usr/share/man/man1/asp-state.1 \
| sed 's/asp-state/asp-state2/g' \
> debian/tmp/usr/share/man/man1/asp-state2.1
+ cp debian/tmp/usr/share/man/man1/asp-state.1 debian/tmp/usr/share/man/man1/asp-state1.1
cat debian/tmp/usr/share/man/man1/mod-mono-server.1 \
| sed 's/mono-server/mono-server2/g' \
> debian/tmp/usr/share/man/man1/mod-mono-server2.1
+ cp debian/tmp/usr/share/man/man1/mod-mono-server.1 debian/tmp/usr/share/man/man1/mod-mono-server1.1
cat debian/tmp/usr/share/man/man1/fastcgi-mono-server.1 \
| sed 's/mono-server/mono-server2/g' \
> debian/tmp/usr/share/man/man1/fastcgi-mono-server2.1
+ cp debian/tmp/usr/share/man/man1/fastcgi-mono-server.1 debian/tmp/usr/share/man/man1/fastcgi-mono-server1.1
# Make dh_installxsp man pages
cd debian && \
@@ -182,4 +189,4 @@
rm ../tarballs/$(DEB_SOURCE_NAME)_$(VERSION).orig.tar.bz2
-.PHONY: build clean binary-arch binary-indep binary install patch unpatch
+.PHONY: build clean binary-arch binary-indep binary install
More information about the Pkg-mono-svn-commits
mailing list