[Pkg-haskell-commits] darcs: haskell-hoogle: Publish resource dir with apache2 alias setting

[kiwamu at debian.or.jp]

Sun Sep  9 08:37:51 UTC 2012  kiwamu at debian.or.jp
  * Publish resource dir with apache2 alias setting
  Ignore-this: 5f3d1c94813af83ce41a6cadadd53e15

    A ./apache.conf
    M ./control +1
    M ./hoogle.install +1
    M ./rules -2 +2

Sun Sep  9 08:37:51 UTC 2012  kiwamu at debian.or.jp
  * Publish resource dir with apache2 alias setting
  Ignore-this: 5f3d1c94813af83ce41a6cadadd53e15
diff -rN -u old-haskell-hoogle//apache.conf new-haskell-hoogle//apache.conf
--- old-haskell-hoogle//apache.conf	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hoogle//apache.conf	2012-09-09 08:42:10.742474083 +0000
@@ -0,0 +1,21 @@
+# Apache config for hoogle
+
+# resource dir
+Alias /hoogle/ /usr/share/hoogle/resources/
+<Directory "/usr/share/hoogle/resources">
+    Options -Indexes FollowSymLinks MultiViews
+    AllowOverride None
+    order deny,allow
+    deny from all
+    allow from localhost 127.0.0.1
+</Directory>
+
+# Disable execution of hoogle from remote hosts
+<Location /cgi-bin/hoogle>
+    order deny,allow
+    deny from all
+    allow from localhost 127.0.0.1
+    # allow from .your_domain.com
+</Location>
+
+# End hoogle config
diff -rN -u old-haskell-hoogle//control new-haskell-hoogle//control
--- old-haskell-hoogle//control	2012-09-09 08:42:10.742474083 +0000
+++ new-haskell-hoogle//control	2012-09-09 08:42:10.746562232 +0000
@@ -116,6 +116,7 @@
 Architecture: any
 Section: misc
 Depends: ${shlibs:Depends}, ${haskell:Depends}, ${misc:Depends}
+Suggests: apache2
 Description: Haskell API Search for Debian system
  Hoogle is a Haskell API search engine, which allows you to
  search many standard Haskell libraries by either function name,
diff -rN -u old-haskell-hoogle//hoogle.install new-haskell-hoogle//hoogle.install
--- old-haskell-hoogle//hoogle.install	2012-09-09 08:42:10.742474083 +0000
+++ new-haskell-hoogle//hoogle.install	2012-09-09 08:42:10.746562232 +0000
@@ -1,2 +1,3 @@
 debian/tmp-inst-*/usr/bin/* /usr/bin/
 debian/tmp-inst-*/usr/share/hoogle-* /usr/share/
+debian/apache.conf /etc/apache2/conf.d/hoogle
diff -rN -u old-haskell-hoogle//rules new-haskell-hoogle//rules
--- old-haskell-hoogle//rules	2012-09-09 08:42:10.730522600 +0000
+++ new-haskell-hoogle//rules	2012-09-09 08:42:10.750522543 +0000
@@ -5,6 +5,6 @@
 build/hoogle:: build-ghc-stamp
 binary-fixup/hoogle::
 	cd debian/hoogle/usr/share/hoogle-$(CABAL_VERSION)/ && ln -s /var/lib/hoogle/databases ./
-	cd debian/hoogle/var/www/ && ln -s /usr/share/hoogle-$(CABAL_VERSION) ./hoogle
-	sed -i -e "s/res\//\/hoogle\/resources\//g" debian/hoogle/usr/share/hoogle-$(CABAL_VERSION)/resources/template.html
+	cd debian/hoogle/usr/share/ && ln -s hoogle-$(CABAL_VERSION) hoogle
+	sed -i -e "s/res\//\/hoogle\//g" debian/hoogle/usr/share/hoogle-$(CABAL_VERSION)/resources/template.html
 	sed -i -e "s/action=\"\.\"/action=\"\.\/hoogle\"/g" debian/hoogle/usr/share/hoogle-$(CABAL_VERSION)/resources/template.html