[Pkg-javascript-commits] [SCM] javascript-common branch, master, updated. 7-7-g2fe3f3a

[Marcelo Jorge Vieira]

The following commit has been merged in the master branch:
commit c98416c59cc6d4967b2ac2bed6584fa8c1eda31e
Author: Marcelo Jorge Vieira <metal at alucinados.com>
Date:   Sun Sep 26 20:05:51 2010 -0300

    Adding configuration for lighttpd (Closes: #594953)
    
    Thanks Rogério Brito <rbrito at ime.usp.br>

diff --git a/debian/control b/debian/control
index 2a9e81f..6848157 100644
--- a/debian/control
+++ b/debian/control
@@ -20,4 +20,4 @@ Description: Base support for JavaScript library packages
  server for every package.
  .
  This is a helper package that creates /usr/share/javascript and enables it in
- the Apache webserver.
+ the Apache and Lighttpd webserver.
diff --git a/debian/javascript-common.install b/debian/javascript-common.install
index 1dcb36f..3ed419c 100644
--- a/debian/javascript-common.install
+++ b/debian/javascript-common.install
@@ -1 +1 @@
-javascript-common.conf		/etc/javascript-common
+*.conf		/etc/javascript-common
diff --git a/debian/javascript-common.postinst b/debian/javascript-common.postinst
index 1775e8a..3b57ada 100644
--- a/debian/javascript-common.postinst
+++ b/debian/javascript-common.postinst
@@ -12,7 +12,14 @@ case "${1}" in
 			restart="apache2"
 		fi
 
-		servers="apache2"
+		mkdir -p /etc/lighttpd/conf-enabled
+		if [ ! -e /etc/lighttpd/conf-available/90-javascript-alias.conf ]
+		then
+			ln -s /etc/javascript-common/lighttpd.conf /etc/lighttpd/conf-enabled/90-javascript-alias.conf
+			restart="lighttpd"
+		fi
+
+		servers="apache2 lighttpd"
 		. /usr/share/wwwconfig-common/restart.sh
 		;;
 
diff --git a/debian/javascript-common.postrm b/debian/javascript-common.postrm
index 521bb70..60da95a 100644
--- a/debian/javascript-common.postrm
+++ b/debian/javascript-common.postrm
@@ -8,9 +8,15 @@ then
 	restart="apache2"
 fi
 
+if [ -L /etc/lighttpd/conf-enabled/90-javascript-alias.conf ]
+then
+	rm -f /etc/lighttpd/conf-enabled/90-javascript-alias.conf
+	restart="lighttpd"
+fi
+
 if [ -e /usr/share/wwwconfig-common/restart.sh ]
 then
-	servers="apache2"
+	servers="apache2 lighttpd"
 	. /usr/share/wwwconfig-common/restart.sh
 fi
 
diff --git a/lighttpd.conf b/lighttpd.conf
new file mode 100644
index 0000000..a8b442f
--- /dev/null
+++ b/lighttpd.conf
@@ -0,0 +1 @@
+alias.url += ("/javascript" => "/usr/share/javascript")

-- 
javascript-common