Changeset - 68948a4680f1
[Not reviewed]
default
1 2 1
Nathan Brink (binki) - 16 years ago 2009-10-10 01:07:03
ohnobinki@ohnopublishing.net
fix reading of and renamed server conf
3 files changed with 4 insertions and 4 deletions:
0 comments (0 inline, 0 general)
etc/Makefile.am
Show inline comments
 
sysconf_DATA = distrenclient.conf distrencommon.conf distrenserver.conf distrenslave.conf
 
sysconf_DATA = distrenclient.conf distrencommon.conf distrendaemon.conf distrenslave.conf
etc/distrendaemon.conf
Show inline comments
 
file renamed from etc/distrenserver.conf to etc/distrendaemon.conf
 
/*
 
 configuration for _this_ server
 
*/
 
me
 
daemon
 
{
 
  datadir = "/var/lib/distren"
 
  render_types = {"povray", "blender", "inkscape", "imagemagick", "dcraw"}
 
}
 

	
 
include("distrencommon.conf")
 

	
 
datadir = "/var/lib/distren"
 

	
 
listen {
 
       type = "unix"
 
       path = "/var/run/distrend.sock"
 
       port = "0770"
 
}
 
\ No newline at end of file
src/server/distrend.c
Show inline comments
 
@@ -452,13 +452,13 @@ int distrend_do_config(int argc, char *a
 

	
 
  fprintf(stderr, "%s:%d running config\n", __FILE__, __LINE__);
 

	
 
  *config = malloc(sizeof(struct distrend_config));
 
  myopts[1].simple_value = &(*config)->datadir;
 

	
 
  options_init(argc, argv, &(*config)->mycfg, myopts, "server", &(*config)->options);
 
  options_init(argc, argv, &(*config)->mycfg, myopts, "daemon", &(*config)->options);
 

	
 
  fprintf(stderr, "using %s as datadir\n", (*config)->datadir);
 

	
 
  xmlcleanup();
 
  return 0;
 
}
0 comments (0 inline, 0 general)