Changeset: 3b36388b2291 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b36388b2291 Modified Files: monetdb4/conf/MonetDB.conf.in monetdb5/conf/monetdb5.conf.in Branch: default Log Message:
fix locations in monetdb conf files diffs (115 lines): diff -r 65ba7a5676fc -r 3b36388b2291 monetdb4/conf/MonetDB.conf.in --- a/monetdb4/conf/MonetDB.conf.in Sat Jan 15 22:32:21 2011 +0100 +++ b/monetdb4/conf/MonetDB.conf.in Sun Jan 16 10:23:25 2011 +0100 @@ -24,7 +24,7 @@ # ----------------------------------------------------------- # # Please keep the comments below aligned with the defaults in # -# MonetDB/src/common/monet_options.mx # +# common/options/monet_options.mx # # ----------------------------------------------------------- # # Where MonetDB is installed @@ -37,7 +37,7 @@ # All databases are stored as a directory under the directory given # below. Use this value to change the overall location of your data. -gdk_dbfarm=@Xlocalstatedir@@DIRSEP@MonetDB4@DIRSEP@dbfarm +gdk_dbfarm=@Xlocalstatedir@@DIRSEP@monetdb4@DIRSEP@dbfarm # MonetDB can only handle one database at a time. You can specify the # name of the database to use below. Note that you can use multiple @@ -117,7 +117,7 @@ # Where do the MonetDB modules reside? # The first directory contains MIL modules, and either the second or # third (depending on the system) the C modules. -monet_mod_path=@Xlibdir@@DIRSEP@MonetDB4@PATHSEP@@Xlibdir@@DIRSEP@MonetDB4@DIRSEP@lib@PATHSEP@@Xlibdir@@DIRSEP@MonetDB4@DIRSEP@bin +monet_mod_path=@Xlibdir@@DIRSEP@monetdb4@PATHSEP@@Xlibdir@@DIRSEP@monetdb4@DIRSEP@lib@PATHSEP@@Xlibdir@@DIRSEP@monetdb4@DIRSEP@bin # Start Mserver in daemon mode, or start with MIL interactive # interface? #monet_daemon=no @@ -164,10 +164,10 @@ xrpc_options="" # Root directory of files that could be served by the XRPC HTTP server -#xrpc_docroot="@Xdatadir@@DIRSEP@MonetDB@DIRSEP@xrpc" +#xrpc_docroot="@Xdatadir@@DIRSEP@monetdb@DIRSEP@xrpc" # IP addresses or hostname separated by ';' who can execute scripts in -# <datadir>/MonetDB/xrpc/admin/ +# <datadir>/monetdb/xrpc/admin/ xrpc_admin="http://127.0.0.1;127.0.0.1;http://localhost;localhost"; # IP addresses or hostname separated by ';' who can retrieve XML @@ -176,14 +176,9 @@ xrpc_user="http://127.0.0.1;127.0.0.1;http://localhost;localhost"; # url prefixes of trusted modules separated by ';' -xrpc_trusted="http://monetdb.cwi.nl;http://127.0.0.1;http://localhost;@Xexec_prefix@@DIRSEP@share@DIRSEP@MonetDB@DIRSEP@xrpc@DIRSEP@export"; +xrpc_trusted="http://monetdb.cwi.nl;http://127.0.0.1;http://localhost;@Xexec_prefix@@DIRSEP@share@DIRSEP@monetdb@DIRSEP@xrpc@DIRSEP@export"; # standoff annotation XPath extension #standoff_ns= #standoff_start=start #standoff_end=end - -# ----------------------------------------------------------- # -# Please keep the comments above aligned with the defaults in # -# MonetDB/src/common/monet_options.mx # -# ----------------------------------------------------------- # diff -r 65ba7a5676fc -r 3b36388b2291 monetdb5/conf/monetdb5.conf.in --- a/monetdb5/conf/monetdb5.conf.in Sat Jan 15 22:32:21 2011 +0100 +++ b/monetdb5/conf/monetdb5.conf.in Sun Jan 16 10:23:25 2011 +0100 @@ -29,7 +29,7 @@ # FIXME: remove this notice for the installed monetdb5.conf # # ----------------------------------------------------------- # # Please keep the comments below aligned with the defaults in # -# MonetDB/src/common/monet_options.mx # +# common/options/monet_options.mx # # ----------------------------------------------------------- # # Absolute path where MonetDB is installed @@ -40,7 +40,7 @@ #============ # All databases are stored as a directory under the directory given # below. Use this value to change the overall location of your data. -gdk_dbfarm=@Xlocalstatedir@@DIRSEP@MonetDB5@DIRSEP@dbfarm +gdk_dbfarm=@Xlocalstatedir@@DIRSEP@monetdb5@DIRSEP@dbfarm # # MonetDB can only handle one database at a time. When you start an # mserver5 manually without specifying the database name yourself, the @@ -55,7 +55,7 @@ # # Where do the MonetDB modules reside? The second path is for windows # dlls. -monet_mod_path=@Xlibdir@@DIRSEP@MonetDB5@PATHSEP@@Xlibdir@@DIRSEP@MonetDB5@DIRSEP@lib@PATHSEP@@Xlibdir@@DIRSEP@MonetDB5@DIRSEP@bin +monet_mod_path=@Xlibdir@@DIRSEP@monetdb5@PATHSEP@@Xlibdir@@DIRSEP@monetdb5@DIRSEP@lib@PATHSEP@@Xlibdir@@DIRSEP@monetdb5@DIRSEP@bin # # Start mserver in daemon mode, or start with MAL interactive # interface? @@ -85,13 +85,13 @@ # mero_errlog pointing to the same file, as in the default below. # Setting mero_msglog and/or mero_errlog to the empty string, results # in merovingian to log to the screen. -#mero_msglog=@Xlocalstatedir@@DIRSEP@log@DIRSEP@MonetDB@[email protected] -#mero_errlog=@Xlocalstatedir@@DIRSEP@log@DIRSEP@MonetDB@[email protected] +#mero_msglog=@Xlocalstatedir@@DIRSEP@log@DIRSEP@monetdb@[email protected] +#mero_errlog=@Xlocalstatedir@@DIRSEP@log@DIRSEP@monetdb@[email protected] # # Merovingian forks itself to detach into the background. It stores # its pid in the following file, which can be used to stop Merovingian # again. -mero_pidfile=@Xlocalstatedir@@DIRSEP@run@DIRSEP@MonetDB@[email protected] +mero_pidfile=@Xlocalstatedir@@DIRSEP@run@DIRSEP@monetdb@[email protected] # # In normal use, Merovingian replaces an mserver, and hence listens # for connections on the same port as an mserver would do (mapi_port). @@ -155,7 +155,7 @@ # listens to that port for remote control commands. This is an all or # nothing scenario, hence any remote monetdb(1) can create, destroy, # etc. As a little protective measure, the file -# @Xlocalstatedir@@DIRSEP@MonetDB5@DIRSEP@dbfarm@[email protected]_pass +# @Xlocalstatedir@@DIRSEP@monetdb5@DIRSEP@dbfarm@[email protected]_pass # contains the passphrase that a remote monetdb(1) needs to issue to # be able to perform any command. For this file the same rules hold # as for the monet_vault_key file. If this file is missing, _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
