DistRen Changeset - ef8623524c7b · protofusion repositories

Changeset - ef8623524c7b

Parent rev.

Child rev.

[Not reviewed]

default

2 1 2

Nathan Brink (binki) - 16 years ago 2009-10-14 23:48:54
ohnobinki@ohnopublishing.net

use substitution for default directories in confs

3 files changed with 6 insertions and 3 deletions:

configure.ac

etc/distrendaemon.conf.in

etc/distrenslave.conf.in

0 comments (0 inline, 0 general)

configure.ac

➞

Show inline comments

@@ @@ -46,17 +46,20 @@ PKG_PROG_PKG_CONFIG(0.17.2) @@
 PKG_CHECK_MODULES(DISTLIBS, libconfuse >= 2.5 libcurl libxml-2.0)
 PKG_CHECK_MODULES([CHECK], [check >= 0.9.3])
 AC_DEFINE_DIR([SYSCONFDIR], [sysconfdir], [Directory to find configuration files in])
 AC_DEFINE_DIR([LOCALSTATEDIR], [localstatedir], [Directory in which the server or client may store its state files and data])
 AC_DEFINE_DIR([RUNSTATEDIR], [localstatedir/run], [Directory where PID files are stored])
 AC_CONFIG_FILES([Makefile
 src/Makefile
 src/common/Makefile
 src/server/Makefile
 src/client/Makefile
 src/tests/Makefile
 etc/Makefile
 etc/distrendaemon.conf
 etc/distrenslave.conf
 ])
 AC_OUTPUT

etc/distrendaemon.conf.in

➞

Show inline comments

@@ file renamed from etc/distrendaemon.conf to etc/distrendaemon.conf.in @@
 /*
  configuration for _this_ server
 */
 daemon
+{
-  datadir = "/var/lib/distren"
+  datadir = "@LOCALSTATEDIR@/@PACKAGE@"
   render_types = {"povray", "blender", "inkscape", "imagemagick", "dcraw"}
+}
 include("distrencommon.conf")
 listen {
        type = "unix"
-       path = "/var/run/distrend.sock"
+       path = "@RUNSTATEDIR@/@PACKAGE@d.sock"
        port = "0770"
+}
@@ \ No newline at end of file @@

etc/distrenslave.conf.in

➞

Show inline comments

@@ file renamed from etc/distrenslave.conf to etc/distrenslave.conf.in @@
@@ @@ -2,7 +2,7 @@ slave @@
+{
   username = "!username"
+}
 include("distrencommon.conf")
-datadir = "/var/lib/distren"
+datadir = "@LOCALSTATEDIR@/@PACKAGE@"

0 comments (0 inline, 0 general)