[Pkg-mono-svn-commits] [SCM] xsp branch, master, updated. debian/2.6.5-3-42-g87885a0
Jo Shields
directhex at apebox.org
Mon Mar 28 07:59:50 UTC 2011
The following commit has been merged in the master branch:
commit 68f8b3b00cdd1d0d0d2b0a090067762d3ef53a3b
Author: Jo Shields <directhex at apebox.org>
Date: Sun Mar 27 20:22:10 2011 +0100
Replace mono-apache-server1 with mono-apache-server4
diff --git a/debian/control b/debian/control
index 131488a..168d11d 100644
--- a/debian/control
+++ b/debian/control
@@ -71,11 +71,9 @@ Description: demo pages for ASP.NET infrastructure
Sample set of .aspx pages to test the XSP server or the mod_mono Apache
module.
-Package: mono-apache-server1
+Package: mono-apache-server4
Architecture: all
-Conflicts: mono-server
-Replaces: mono-server, mono-apache-server (<= 2.4)
-Depends: ${misc:Depends}, ${cli:Depends}, mono-xsp-base (= ${source:Version}), perl-modules
+Depends: ${misc:Depends}, ${cli:Depends}, mono-xsp4-base (= ${source:Version}), perl-modules
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
diff --git a/debian/mono-apache-server1.default b/debian/mono-apache-server1.default
deleted file mode 100644
index 0c1f72f..0000000
--- a/debian/mono-apache-server1.default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Defaults for mono-apache-server
-
-# Should mono-apache-server start apache?
-start_apache=false
diff --git a/debian/mono-apache-server1.install b/debian/mono-apache-server1.install
deleted file mode 100644
index d33ad8d..0000000
--- a/debian/mono-apache-server1.install
+++ /dev/null
@@ -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-server1
-debian/tmp/usr/sbin/mono-server-admin
-debian/tmp/usr/sbin/mono-server-update
diff --git a/debian/mono-apache-server1.manpages b/debian/mono-apache-server1.manpages
deleted file mode 100644
index 0ae8578..0000000
--- a/debian/mono-apache-server1.manpages
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/debian/mono-apache-server1.templates b/debian/mono-apache-server1.templates
deleted file mode 100644
index e81cb1b..0000000
--- a/debian/mono-apache-server1.templates
+++ /dev/null
@@ -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.
diff --git a/debian/mono-apache-server1.README.Debian b/debian/mono-apache-server4.README.Debian
similarity index 62%
rename from debian/mono-apache-server1.README.Debian
rename to debian/mono-apache-server4.README.Debian
index a7ecf3d..2e72975 100644
--- a/debian/mono-apache-server1.README.Debian
+++ b/debian/mono-apache-server4.README.Debian
@@ -1,20 +1,19 @@
-mono-apache-server for Debian
+mono-apache-server4 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-server4 is a backend server that allows you to run ASP.NET web
+applications in conjunction with Apache and the mod_mono Apache module.
+In Debian, mod-mono-server4 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
+mod-mono-server4 creates a socket in /tmp, and mod_mono communicates with
+mod-mono-server4 through that socket. Apache will pass the HTTP request via
+mod_mono to mod-mono-server, and mod-mono-server4 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
+/etc/mono-server4/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.
@@ -22,27 +21,27 @@ 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-server4 -- 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
+/etc/mono-server4 <- The root of the configuration structure
+/etc/mono-server4/conf.d <- VirtualHosts Config Directories
+/etc/mono-server4/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
+/etc/mono-server4/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
+structure and rebuild the mono-server-hosts.conf file. mod-mono-server4 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
+above procedure. If mod-mono-server4 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
diff --git a/debian/mono-apache-server1.config b/debian/mono-apache-server4.config
similarity index 65%
rename from debian/mono-apache-server1.config
rename to debian/mono-apache-server4.config
index d339177..d98d2a3 100644
--- a/debian/mono-apache-server1.config
+++ b/debian/mono-apache-server4.config
@@ -9,13 +9,13 @@ STATE=1
while [ "$STATE" != 0 -a "$STATE" != 2 ]; do
case "$STATE" in
1)
- db_input medium monoserver/monoserver_restartapache || true
+ db_input medium monoserver4/monoserver4_restartapache || true
if db_go; then
- db_get monoserver/monoserver_restartapache || true
+ db_get monoserver4/monoserver4_restartapache || true
if [ "$RET" = "true" ]; then
STATE=2
else
- db_set monoserver/monoserver_restartapache false || true
+ db_set monoserver4/monoserver4_restartapache false || true
STATE=2
fi
else
diff --git a/debian/mono-apache-server4.default b/debian/mono-apache-server4.default
new file mode 100644
index 0000000..ad02cb3
--- /dev/null
+++ b/debian/mono-apache-server4.default
@@ -0,0 +1,4 @@
+# Defaults for mono-apache-server4
+
+# Should mono-apache-server4 start apache?
+start_apache=false
diff --git a/debian/mono-apache-server1.docs b/debian/mono-apache-server4.docs
similarity index 100%
rename from debian/mono-apache-server1.docs
rename to debian/mono-apache-server4.docs
diff --git a/debian/mono-apache-server4.install b/debian/mono-apache-server4.install
new file mode 100644
index 0000000..cdd8f64
--- /dev/null
+++ b/debian/mono-apache-server4.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/lib/mono/4.0/mod-mono-server4.exe
+debian/tmp/usr/lib/mono/gac/mod-mono-server4
+debian/tmp/usr/bin/mod-mono-server4
+debian/tmp/usr/sbin/mono-server4-admin
+debian/tmp/usr/sbin/mono-server4-update
diff --git a/debian/mono-apache-server4.manpages b/debian/mono-apache-server4.manpages
new file mode 100644
index 0000000..c9f1077
--- /dev/null
+++ b/debian/mono-apache-server4.manpages
@@ -0,0 +1,4 @@
+debian/mono-server4-admin.8
+debian/mono-server4-update.8
+debian/update-mono-server4.8
+debian/tmp/usr/share/man/man1/mod-mono-server4.1
diff --git a/debian/mono-apache-server1.postinst b/debian/mono-apache-server4.postinst
similarity index 72%
rename from debian/mono-apache-server1.postinst
rename to debian/mono-apache-server4.postinst
index 6746f1f..2fc1bb2 100644
--- a/debian/mono-apache-server1.postinst
+++ b/debian/mono-apache-server4.postinst
@@ -4,7 +4,7 @@ set -e
. /usr/share/debconf/confmodule
db_version 2.0
-modmono_default="/etc/default/mono-apache-server1"
+modmono_default="/etc/default/mono-apache-server4"
restart_apache_on() {
sed s/start_apache=false/start_apache=true/g $modmono_default > $tempfile
@@ -17,8 +17,8 @@ restart_apache_off() {
}
daemon_turn_off() {
- if [ -x /etc/init.d/mono-server ]; then
- update-rc.d -f mono-server remove > /dev/null
+ if [ -x /etc/init.d/mono-server4 ]; then
+ update-rc.d -f mono-server4 remove > /dev/null
fi
}
@@ -26,7 +26,7 @@ case "$1" in
configure)
tempfile=$(/bin/tempfile)
- db_get monoserver/monoserver_restartapache || true
+ db_get monoserver4/monoserver4_restartapache || true
daemon_turn_off
if [ "$RET" = "true" ]; then
restart_apache_on
@@ -34,7 +34,7 @@ case "$1" in
restart_apache_off
fi
- mono-server-update
+ mono-server4-update
rm $tempfile
;;
diff --git a/debian/mono-apache-server4.templates b/debian/mono-apache-server4.templates
new file mode 100644
index 0000000..b6b0e21
--- /dev/null
+++ b/debian/mono-apache-server4.templates
@@ -0,0 +1,10 @@
+Template: monoserver4/monoserver4_restartapache
+Type: boolean
+Default: true
+_Description: Let mono-apache-server4 restart Apache?
+ The Debian version of mono-apache-server4 includes a
+ mono-server4-update script that creates a configuration file for
+ apache to start the ASP.NET applications, and mono-server4-update can
+ restart apache if there's a new configuration file
+ (/etc/mono-server4/mono-server-hosts.conf). If this is true, then
+ Apache will be restarted when there is a new mono-server4-hosts.conf file.
--
xsp
More information about the Pkg-mono-svn-commits
mailing list