Author: tille
Date: 2009-01-26 14:58:35 +0000 (Mon, 26 Jan 2009)
New Revision: 3060
Added:
trunk/packages/mlstdbnet/trunk/debian/more_examples/cdif.sql
Modified:
trunk/packages/mlstdbnet/trunk/debian/patches/13_ident_authentication.patch
trunk/packages/mlstdbnet/trunk/debian/postinst
trunk/packages/mlstdbnet/trunk/debian/postrm
trunk/packages/mlstdbnet/trunk/debian/prerm
Log:
Fix database ident authentication code for mlstdbnet.pl, curator.pl has to be
fixed later
Added: trunk/packages/mlstdbnet/trunk/debian/more_examples/cdif.sql
===================================================================
--- trunk/packages/mlstdbnet/trunk/debian/more_examples/cdif.sql
(rev 0)
+++ trunk/packages/mlstdbnet/trunk/debian/more_examples/cdif.sql
2009-01-26 14:58:35 UTC (rev 3060)
@@ -0,0 +1,92 @@
+CREATE USER remote NOCREATEDB NOCREATEUSER;
+
+CREATE TABLE users
+(id INTEGER NOT NULL UNIQUE,
+user_name varchar NOT NULL UNIQUE,
+surname varchar NOT NULL,
+first_name varchar NOT NULL,
+email varchar NOT NULL,
+affiliation varchar NOT NULL,
+status varchar NOT NULL,
+datestamp date NOT NULL,
+curator varchar NOT NULL,
+PRIMARY KEY (id));
+
+GRANT SELECT,UPDATE,INSERT,DELETE ON users TO "www-data";
+GRANT SELECT ON users TO remote;
+
+CREATE TABLE TR6
+(id integer NOT NULL UNIQUE,
+sender integer NOT NULL,
+datestamp date NOT NULL,
+curator integer NOT NULL,
+sequence varchar NOT NULL UNIQUE,
+PRIMARY KEY (id),
+CONSTRAINT TR6cur FOREIGN KEY (curator) REFERENCES users
+ON DELETE NO ACTION
+ON UPDATE CASCADE,
+CONSTRAINT TR6sen FOREIGN KEY (sender) REFERENCES users
+ON DELETE NO ACTION
+ON UPDATE CASCADE
+);
+
+GRANT SELECT,UPDATE,INSERT,DELETE ON TR6 TO "www-data";
+GRANT SELECT ON TR6 TO remote;
+
+CREATE TABLE TR10
+(id integer NOT NULL UNIQUE,
+sender integer NOT NULL,
+datestamp date NOT NULL,
+curator integer NOT NULL,
+sequence varchar NOT NULL UNIQUE,
+PRIMARY KEY (id),
+CONSTRAINT TR10cur FOREIGN KEY (curator) REFERENCES users
+ON DELETE NO ACTION
+ON UPDATE CASCADE,
+CONSTRAINT TR10sen FOREIGN KEY (sender) REFERENCES users
+ON DELETE NO ACTION
+ON UPDATE CASCADE
+);
+
+GRANT SELECT,UPDATE,INSERT,DELETE ON TR10 TO "www-data";
+GRANT SELECT ON TR10 TO remote;
+
+CREATE TABLE profiles
+(ST integer NOT NULL UNIQUE,
+TR6 integer NOT NULL,
+TR10 integer NOT NULL,
+clonal_complex varchar,
+sender integer NOT NULL,
+curator integer NOT NULL,
+datestamp date NOT NULL,
+PRIMARY KEY (st),
+CONSTRAINT proTR6 FOREIGN KEY (TR6) REFERENCES TR6
+ON DELETE NO ACTION
+ON UPDATE CASCADE,
+CONSTRAINT proTR10 FOREIGN KEY (TR10) REFERENCES TR10
+ON DELETE NO ACTION
+ON UPDATE CASCADE,
+CONSTRAINT procurator FOREIGN KEY (curator) REFERENCES users
+ON DELETE NO ACTION
+ON UPDATE CASCADE,
+CONSTRAINT prosender FOREIGN KEY (sender) REFERENCES users
+ON DELETE NO ACTION
+ON UPDATE CASCADE
+);
+
+CREATE UNIQUE INDEX profindex ON profiles (TR6,TR10);
+
+GRANT SELECT,UPDATE,INSERT,DELETE ON profiles TO "www-data";
+GRANT SELECT ON profiles TO remote;
+
+CREATE TABLE clients (
+id integer NOT NULL,
+name varchar NOT NULL,
+xml varchar NOT NULL,
+description varchar,
+hostscript varchar,
+PRIMARY KEY (id)
+);
+
+GRANT SELECT ON clients TO "www-data";
+
Modified:
trunk/packages/mlstdbnet/trunk/debian/patches/13_ident_authentication.patch
===================================================================
--- trunk/packages/mlstdbnet/trunk/debian/patches/13_ident_authentication.patch
2009-01-26 10:36:12 UTC (rev 3059)
+++ trunk/packages/mlstdbnet/trunk/debian/patches/13_ident_authentication.patch
2009-01-26 14:58:35 UTC (rev 3060)
@@ -29,7 +29,7 @@
sub dbdisconnect {
--- mlstdbnet_v2.0.0.orig/cgi-bin/mlstdbnet.pl
+++ mlstdbnet_v2.0.0/cgi-bin/mlstdbnet.pl
-@@ -376,10 +376,19 @@
+@@ -376,19 +376,35 @@
##################DATABASE CONNECTION########################
sub db_connect {
@@ -38,15 +38,34 @@
+ # needs and empty string for user and password ...
+ if ( $system{'host'} =~ /^localhost$/ ) {
+ $db = DBI->connect(
-+"DBI:Pg:dbname=$system{'longcode'}",
++"DBI:Pg:database=$system{'longcode'};port=$system{'port'}",
+ '', '', { AutoCommit => 0 }
+ );
+ } else {
+ $db = DBI->connect(
"DBI:Pg:host=$system{'host'};port=$system{'port'};dbname=$system{'longcode'}",
"$system{'user'}", "$system{'pass'}", { AutoCommit => 0 }
- );
+- );
++ );
+ }
$db->do("SET session CHARACTERISTICS AS TRANSACTION READ ONLY");
$db->commit();
if ( !$profiledb && !$system{'nomlst'} ) {
+- $dbp = DBI->connect(
++ if ( $system{'profiles_host'} =~ /^localhost$/ ) {
++ $dbp = DBI->connect(
++"DBI:Pg:database=$system{'dbprof'};port=$system{'profiles_port'}",
++ '', '', { AutoCommit => 0 }
++ );
++ } else {
++ $dbp = DBI->connect(
+
"DBI:Pg:host=$system{'profiles_host'};port=$system{'profiles_port'};dbname=$system{'dbprof'}",
+ "$system{'profiles_user'}",
+ "$system{'profiles_pass'}",
+ { AutoCommit => 0 }
+- );
++ );
++ }
+ $dbp->do("SET session CHARACTERISTICS AS TRANSACTION READ
ONLY");
+ $dbp->commit();
+ }
Modified: trunk/packages/mlstdbnet/trunk/debian/postinst
===================================================================
--- trunk/packages/mlstdbnet/trunk/debian/postinst 2009-01-26 10:36:12 UTC
(rev 3059)
+++ trunk/packages/mlstdbnet/trunk/debian/postinst 2009-01-26 14:58:35 UTC
(rev 3060)
@@ -1,6 +1,5 @@
#!/bin/sh -e
# postinst script for agdbnet/mlstdbnet
-
# set -ex
pkg=mlstdbnet
Modified: trunk/packages/mlstdbnet/trunk/debian/postrm
===================================================================
--- trunk/packages/mlstdbnet/trunk/debian/postrm 2009-01-26 10:36:12 UTC
(rev 3059)
+++ trunk/packages/mlstdbnet/trunk/debian/postrm 2009-01-26 14:58:35 UTC
(rev 3060)
@@ -1,8 +1,7 @@
-#!/bin/sh
+#!/bin/sh -e
# postrm script for mlstdbnet
+# set -ex
-set -e
-
pkg=mlstdbnet
. /usr/share/debconf/confmodule
Modified: trunk/packages/mlstdbnet/trunk/debian/prerm
===================================================================
--- trunk/packages/mlstdbnet/trunk/debian/prerm 2009-01-26 10:36:12 UTC (rev
3059)
+++ trunk/packages/mlstdbnet/trunk/debian/prerm 2009-01-26 14:58:35 UTC (rev
3060)
@@ -1,8 +1,7 @@
-#!/bin/sh
+#!/bin/sh -e
# prerm script for mlstdbnet
+# set -ex
-set -e
-
pkg=mlstdbnet
. /usr/share/debconf/confmodule
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
