diff options
| -rw-r--r-- | gentoobrowse/datasources/postgres-web.xml | 10 | ||||
| -rw-r--r-- | gentoobrowse/datasources/postgres.xml | 11 |
2 files changed, 7 insertions, 14 deletions
diff --git a/gentoobrowse/datasources/postgres-web.xml b/gentoobrowse/datasources/postgres-web.xml index 7ee517b..426f6ee 100644 --- a/gentoobrowse/datasources/postgres-web.xml +++ b/gentoobrowse/datasources/postgres-web.xml @@ -1,10 +1,10 @@ <?xml version="1.0"?> <project2:rdbmsdatasource xmlns:project2="http://project2.randomdan.homeip.net" name="postgres-web"> <readonly preferlocal="true"> - <dsn host="firebrand"><odbc>Driver=postgresql;ServerName=firebrand.random.lan;Username=apache;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public;</odbc></dsn> - <dsn host="defiant"><odbc>Driver=postgresql;ServerName=defiant.random.lan;Username=apache;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public;</odbc></dsn> - <dsn host="akira"><odbc>Driver=postgresql;ServerName=akira.random.lan;Username=apache;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public;</odbc></dsn> - <dsn host="riogrande"><odbc>Driver=postgresql;ServerName=riogrande.random.lan;Username=apache;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public;</odbc></dsn> + <dsn host="firebrand"><postgresql>host=firebrand.random.lan user=apache dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></dsn> + <dsn host="defiant"><postgresql>host=defiant.random.lan user=apache dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></dsn> + <dsn host="akira"><postgresql>host=akira.random.lan user=apache dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></dsn> + <dsn host="riogrande"><postgresql>host=riogrande.random.lan user=apache dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></dsn> </readonly> - <masterdsn><odbc>Driver=postgresql;ServerName=postgresql.random.lan;Username=apache;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public;</odbc></masterdsn> + <masterdsn><postgresql>host=firebrand.random.lan user=apache dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></masterdsn> </project2:rdbmsdatasource> diff --git a/gentoobrowse/datasources/postgres.xml b/gentoobrowse/datasources/postgres.xml index 0a57c93..4824855 100644 --- a/gentoobrowse/datasources/postgres.xml +++ b/gentoobrowse/datasources/postgres.xml @@ -1,14 +1,7 @@ <?xml version="1.0"?> <project2:rdbmsdatasource xmlns:project2="http://project2.randomdan.homeip.net" name="postgres"> <readonly preferlocal="true"> - <dsn host="firebrand"> - <odbc>Driver=postgresql;ServerName=firebrand.random.lan;Username=gentoo;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public;</odbc> - </dsn> - <dsn host="defiant"> - <odbc>Driver=postgresql;ServerName=defiant.random.lan;Username=gentoo;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public;</odbc> - </dsn> + <dsn host="firebrand"><postgresql>host=localhost user=gentoo dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></dsn> </readonly> - <masterdsn> - <odbc>Driver=postgresql;ServerName=postgresql.random.lan;Username=gentoo;Database=gentoo;Password=gentoo;ConnSettings=SET search_path=gentoobrowse,public;</odbc> - </masterdsn> + <masterdsn><postgresql>host=localhost user=gentoo dbname=gentoo options='-c search_path=gentoobrowse,public'</postgresql></masterdsn> </project2:rdbmsdatasource> |