From 5df9d386bdbb242b44f055b3db02e145260db073 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Thu, 15 May 2008 12:37:16 +0200 Subject: [PATCH] Install the configuration file of submitd at the right location. --- Makefile | 2 +- TODO | 3 +++ submit/Makefile | 3 +++ submit/submitd.c | 2 +- submit/{config => submitd.cf} | 2 ++ 5 files changed, 10 insertions(+), 2 deletions(-) rename submit/{config => submitd.cf} (98%) diff --git a/Makefile b/Makefile index e183f4c..226437e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ VERSION=1.0.99-20080220 # The default target -all: runtree programs datafiles +all: runtree programs datafiles configs # Include configuration s=. diff --git a/TODO b/TODO index f709cdf..ec8d447 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,6 @@ +New directory layout +~~~~~~~~~~~~~~~~~~~~ +public/ is broken Convert md5crypt to use MD5 from libucw Evaluator diff --git a/submit/Makefile b/submit/Makefile index fe9f0bd..9e7e0a6 100644 --- a/submit/Makefile +++ b/submit/Makefile @@ -26,6 +26,9 @@ $(SDIR)/privkey: $(SDIR)/privkey.o $(LIBUCW) $(SDIR)/privkey: CFLAGS+=$(TLSCF) $(GCRCF) $(SDIR)/privkey: LIBS+=$(TLSLF) +CONFIGS+=submitd +run/cf/submitd: $(SDIR)/submitd.cf + ### Submitter perl module ### EXTRA_RUNDIRS+=lib/perl5/MO diff --git a/submit/submitd.c b/submit/submitd.c index 6baf999..d062815 100644 --- a/submit/submitd.c +++ b/submit/submitd.c @@ -538,7 +538,7 @@ reject2: ; int main(int argc, char **argv) { setproctitle_init(argc, argv); - cf_def_file = "submit/config"; + cf_def_file = "cf/submitd"; cf_declare_section("SubmitD", &submitd_conf, 0); cf_declare_section("Tasks", &tasks_conf, 0); diff --git a/submit/config b/submit/submitd.cf similarity index 98% rename from submit/config rename to submit/submitd.cf index 85d2669..778b208 100644 --- a/submit/config +++ b/submit/submitd.cf @@ -1,5 +1,7 @@ # Configuration file for the submit server +include cf/library + SubmitD { # Log file (optional) -- 2.39.2