passgen: use portal config, build fixes

diff --git a/passgen/Makefile b/passgen/Makefile
index df49375..b78974a 100644 (file)
--- a/passgen/Makefile
+++ b/passgen/Makefile
@@ -5,5 +5,5 @@ all: passgen.mlt
 clean:
        rm passgen.mlt
 
-passgen.mlt: $(prefix)/etc/hcoop.header $(prefix)/etc/hcoop.footer passgen.mlt.in
+passgen.mlt: $(prefix)/etc/hcoop.header $(prefix)/etc/hcoop.footer passgen.mlt.in /usr/bin/apg
        $(prefix)/bin/hcoop_html $(prefix) "HCoop Passgen" passgen.mlt.in >passgen.mlt

diff --git a/passgen/config.sig b/passgen/config.sig
deleted file mode 100644 (file)
index b61e7c63a026428acb9121421d3b3f1fe7ed72a8..0000000000000000000000000000000000000000
--- a/passgen/config.sig
+++ /dev/null
@@ -1,3 +0,0 @@
-signature CONFIG = sig
-    val dbstring : string
-end

diff --git a/passgen/config.sig b/passgen/config.sig
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..c5109c4f8055b96ba9ede6890cb14dbcf529d0d3
--- /dev/null
+++ b/passgen/config.sig
@@ -0,0 +1 @@
+../config.sig
\ No newline at end of file

diff --git a/passgen/config.sml b/passgen/config.sml
deleted file mode 100644 (file)
index 525a3f53a2f48822a57d48b100b73f7ce4ee81f4..0000000000000000000000000000000000000000
--- a/passgen/config.sml
+++ /dev/null
@@ -1,5 +0,0 @@
-structure Config :> CONFIG = struct
-
-val dbstring = "dbname=passgen host=postgres"
-
-end

diff --git a/passgen/config.sml b/passgen/config.sml
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..2b43659f3c0ab10009b5272c35d2004fae7528f5
--- /dev/null
+++ b/passgen/config.sml
@@ -0,0 +1 @@
+../config.sml
\ No newline at end of file

diff --git a/passgen/mlt.conf b/passgen/mlt.conf
index 778f75d..b0a3193 100644 (file)
--- a/passgen/mlt.conf
+++ b/passgen/mlt.conf
@@ -3,7 +3,8 @@ after   after
 exn    exn
 
 out    out
-pub    /afs/hcoop.net/user/h/hc/hcoop/public_html/cgi-bin
+pub    /afs/hcoop.net/user/h/hc/hcoop/portal-tools/cgi
+
+cm     /afs/hcoop.net/user/h/hc/hcoop/portal-tools/src/smlsql/smlsql.cm
+cm     /afs/hcoop.net/user/h/hc/hcoop/portal-tools/src/smlsql/libpq/sources.cm
 
-cm     /usr/local/share/smlsql/smlsql.cm
-cm     /usr/local/share/smlsql/libpq/sources.cm

diff --git a/passgen/passgen.sml b/passgen/passgen.sml
index 4de2583..591bcac 100644 (file)
--- a/passgen/passgen.sml
+++ b/passgen/passgen.sml
@@ -8,7 +8,7 @@ fun getDb () = valOf (!db)
 
 fun begin () =
     let
-       val c = C.conn dbstring
+       val c = C.conn passgenDbstring
     in
        db := SOME c;
        ignore (C.dml c "BEGIN")