Author: tille
Date: 2008-09-23 14:26:39 +0000 (Tue, 23 Sep 2008)
New Revision: 2524
Added:
trunk/packages/agdbnet/trunk/debian/apache.conf
Modified:
trunk/packages/agdbnet/trunk/debian/control
trunk/packages/agdbnet/trunk/debian/dirs
trunk/packages/agdbnet/trunk/debian/install
trunk/packages/agdbnet/trunk/debian/postinst
trunk/packages/agdbnet/trunk/debian/rules
Log:
Moved agcurate.pl in a separate cgi directory as suggested in install manual
but fail to force apache to ask for user authentication ...
Added: trunk/packages/agdbnet/trunk/debian/apache.conf
===================================================================
--- trunk/packages/agdbnet/trunk/debian/apache.conf
(rev 0)
+++ trunk/packages/agdbnet/trunk/debian/apache.conf 2008-09-23 14:26:39 UTC
(rev 2524)
@@ -0,0 +1,15 @@
+# agcurate default Apache configuration
+
+ScriptAlias /agcurate/ /usr/share/agdbnet/cgi-bin/
+<Directory "/usr/share/agdbnet/cgi-bin">
+ AllowOverride None
+ Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
+ Order allow,deny
+ Allow from all
+
+ # Authorize for setup
+ <Files agcurate.pl>
+ AuthType Basic
+ # Require valid-user
+ </Files>
+</Directory>
Modified: trunk/packages/agdbnet/trunk/debian/control
===================================================================
--- trunk/packages/agdbnet/trunk/debian/control 2008-09-23 13:23:56 UTC (rev
2523)
+++ trunk/packages/agdbnet/trunk/debian/control 2008-09-23 14:26:39 UTC (rev
2524)
@@ -13,7 +13,7 @@
Package: agdbnet
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, emboss, blast2, postgresql-8.3,
- libcgi-pm-perl, libdbd-pg-perl, libxml-perl, dbconfig-common
+ libcgi-pm-perl, libdbd-pg-perl, libxml-perl, dbconfig-common, apache2
Description: antigen sequence database software for web-based bacterial typing
AgdbNet facilitates simultaneous BLAST querying of multiple loci using
either nucleotide or peptide sequences. Databases are described by XML
Modified: trunk/packages/agdbnet/trunk/debian/dirs
===================================================================
--- trunk/packages/agdbnet/trunk/debian/dirs 2008-09-23 13:23:56 UTC (rev
2523)
+++ trunk/packages/agdbnet/trunk/debian/dirs 2008-09-23 14:26:39 UTC (rev
2524)
@@ -1,2 +1,3 @@
etc/agdbnet
+etc/apache2/conf.d
usr/share/dbconfig-common/data/agdbnet/install
Modified: trunk/packages/agdbnet/trunk/debian/install
===================================================================
--- trunk/packages/agdbnet/trunk/debian/install 2008-09-23 13:23:56 UTC (rev
2523)
+++ trunk/packages/agdbnet/trunk/debian/install 2008-09-23 14:26:39 UTC (rev
2524)
@@ -1,4 +1,5 @@
-cgi-bin usr/lib
+cgi-bin/agdbnet.pl usr/lib/cgi-bin
+cgi-bin/agcurate.pl usr/share/agdbnet/cgi-bin
debian/template usr/share/agdbnet
scripts/*.pl usr/share/agdbnet
stylesheets/stylesheet.css usr/share/agdbnet/template
Modified: trunk/packages/agdbnet/trunk/debian/postinst
===================================================================
--- trunk/packages/agdbnet/trunk/debian/postinst 2008-09-23 13:23:56 UTC
(rev 2523)
+++ trunk/packages/agdbnet/trunk/debian/postinst 2008-09-23 14:26:39 UTC
(rev 2524)
@@ -98,6 +98,13 @@
chmod 777 ${SQLDIR}
/usr/share/${pkg}/xml2sql.pl -u '"www-data"' "$XMLOUT" >
"$SQLDIR"/"$XMLNAME".sql
chmod 666 "$SQLDIR"/"$XMLNAME".sql
+
+ # Restart Apache to register configuration for agcurator
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d apache2 reload 3>/dev/null || true
+ else
+ /etc/init.d/apache2 reload 3>/dev/null || true
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/packages/agdbnet/trunk/debian/rules
===================================================================
--- trunk/packages/agdbnet/trunk/debian/rules 2008-09-23 13:23:56 UTC (rev
2523)
+++ trunk/packages/agdbnet/trunk/debian/rules 2008-09-23 14:26:39 UTC (rev
2524)
@@ -19,6 +19,9 @@
# keep lintian silent ...
chmod 644
debian/$(pkg)/usr/share/dbconfig-common/data/${pkg}/install/pgsql
+ # Apache configuration for agcurator.pl
+ cp -a debian/apache.conf debian/$(pkg)/etc/apache2/conf.d/agdbnet
+
# To update po files as recommended in po-debconf(7)
clean::
@debconf-updatepo
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
