Point to the correct directories.

	Move the Voip schema to be located next to the voip
	configuration that uses it, just like the other examples

diff --git a/raddb/sql/mssql/dialup.conf b/raddb/sql/mssql/dialup.conf
index 70d4492..c1b8469 100644 (file)
--- a/raddb/sql/mssql/dialup.conf
+++ b/raddb/sql/mssql/dialup.conf
@@ -3,7 +3,7 @@
 #
 #  The database schema is available at:
 #
-#      doc/examples/mssql.sql
+#      raddb/sql/mssql/schema.sql
 #
 #  $Id$
 #

diff --git a/src/billing/cisco_h323_db_schema-postgres.sql b/raddb/sql/postgresql/cisco_h323_db_schema.sql
similarity index 96%
rename from src/billing/cisco_h323_db_schema-postgres.sql
rename to raddb/sql/postgresql/cisco_h323_db_schema.sql
index f5ec30b..9596a7d 100644 (file)
--- a/src/billing/cisco_h323_db_schema-postgres.sql
+++ b/raddb/sql/postgresql/cisco_h323_db_schema.sql
@@ -1,20 +1,20 @@
 /*
- * Id: postgresql.conf,v 1.8.2.11 2003/07/15 11:15:43 pnixon Exp $
+ * $Id$
  *
  * --- Peter Nixon [ codemonkey@peternixon.net ]
- * This is a custom SQL schema for doing H323 and SIP VoIP accounting with FreeRadius
- * and Cisco equipment. It is currently known to work with 3640, 5300 and 5350 series
- * as well as CSPS (Cisco SIP Proxy Server).
- * It will scale ALOT better than the default radius schema which is designed for
- * simple dialup installations of FreeRadius.
  *
- * For this schema to work properly you MUST replace raddb/postgresql.conf
- * with the contents of pgsql-voip.conf
+ * This is a custom SQL schema for doing H323 and SIP VoIP accounting
+ * with FreeRadius and Cisco equipment. It is currently known to work
+ * with 3640, 5300 and 5350 series as well as CSPS (Cisco SIP Proxy
+ * Server).  It will scale A LOT better than the default radius schema
+ * which is designed for simple dialup installations of FreeRadius.
  *
- * If you wish to do RADIUS Authentication using the same database, you must use
- * src/modules/rlm_sql/drivers/rlm_sql_postgresql/db_postgresql.sql as well as
- * this schema.
+ * For this schema to work properly you MUST use
+ * raddb/sql/postgresql/voip-postpaid.conf rather than
+ * raddb/sql/postgresql/dialup.conf
  *
+ * If you wish to do RADIUS Authentication using the same database,
+ * you MUST use use raddb/sql/postgresql/schema.sql as well as this schema.
  */
 
 /*

diff --git a/raddb/sql/postgresql/dialup.conf b/raddb/sql/postgresql/dialup.conf
index ed1a3f8..8a91984 100644 (file)
--- a/raddb/sql/postgresql/dialup.conf
+++ b/raddb/sql/postgresql/dialup.conf
@@ -5,7 +5,7 @@
 #
 #  The database schema is available at:
 #
-#      doc/examples/postgresql.sql
+#      raddb/sql/postgresql/schema.sql
 #
 
 

diff --git a/raddb/sql/postgresql/schema.sql b/raddb/sql/postgresql/schema.sql
index d175aa9..de15b9f 100644 (file)
--- a/raddb/sql/postgresql/schema.sql
+++ b/raddb/sql/postgresql/schema.sql
@@ -181,7 +181,7 @@ CREATE TABLE radpostauth (
 
 /*
  * Note: (pnixon: 2003-12-10) The following function should not be required
- * if you use the PG specific queries in raddb/postgresql.conf
+ * if you use the PG specific queries in raddb/sql/postgresql/dialup.conf
  *
  * Common utility function for date calculations. This is used in our
  * alternative account stop query to calculate the start of a session.

diff --git a/raddb/sql/postgresql/voip-postpaid.conf b/raddb/sql/postgresql/voip-postpaid.conf
index 001a724..991f857 100644 (file)
--- a/raddb/sql/postgresql/voip-postpaid.conf
+++ b/raddb/sql/postgresql/voip-postpaid.conf
@@ -1,10 +1,10 @@
-#  Id: postgresql.conf,v 1.8.2.11 2003/07/15 11:15:43 pnixon Exp $
+#  $Id$
 #
 #  Configuration for the SQL module, when doing H323 VoIP billing.
 #
 #  The database schema is available at:
 #
-#   src/radiusd/src/billing/h323_db_postgresql.sql
+#   raddb/sql/postgresql/cisco_h323_db_schema.sql
 #
 sql pgsql-voip {
 

diff --git a/src/billing/cisco_h323_db_sample_functions-postgres.sql b/src/billing/cisco_h323_db_sample_functions-postgres.sql
index c954c93..7d24ed8 100644 (file)
--- a/src/billing/cisco_h323_db_sample_functions-postgres.sql
+++ b/src/billing/cisco_h323_db_sample_functions-postgres.sql
@@ -1,4 +1,4 @@
--- Id: postgresql.conf,v 1.8.2.11 2003/07/15 11:15:43 pnixon Exp $
+-- $Id$
 
 -- create plpgsql language
 CREATE FUNCTION "plpgsql_call_handler" () RETURNS LANGUAGE_HANDLER AS '$libdir/plpgsql' LANGUAGE C;