From: Jonathan McDowell Date: Tue, 14 Sep 2004 16:16:52 +0000 (+0000) Subject: Configure basic onak.conf using autoconf info. X-Git-Tag: 0.3.0~8 X-Git-Url: http://the.earth.li/gitweb/?p=onak.git;a=commitdiff_plain;h=a047e3e158d560af079bec920460711d8222317c Configure basic onak.conf using autoconf info. Write a basic onak.conf that has paths from the autoconf info, rather than hard coded paths to my homedir. --- diff --git a/Makefile.in b/Makefile.in index 5cb723f..01169b2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -11,6 +11,7 @@ DBTYPE = @DBTYPE@ # LIBS = @LIBS@ prefix ?= @prefix@ +exec_prefix ?= @exec_prefix@ PROGS = add lookup gpgwww onak splitkeys onak-mail.pl stripkey CORE_OBJS = armor.o charfuncs.o decodekey.o getcgi.o hash.o keydb_$(DBTYPE).o \ @@ -22,7 +23,7 @@ SRCS = armor.c parsekey.c merge.c keyid.c md5.c sha1.c main.c getcgi.c mem.c \ gpgwww.c onak-conf.c charfuncs.c sendsync.c log.c photoid.c \ wordlist.c cleankey.c cleanup.c -all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys +all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf splitkeys: splitkeys.o $(CORE_OBJS) $(CC) $(LDFLAGS) -o splitkeys splitkeys.o $(CORE_OBJS) $(LIBS) @@ -61,10 +62,15 @@ onak-mail.pl: onak-mail.pl.in sed 's:@CONFIG@:@sysconfdir@/onak.conf:g' < onak-mail.pl.in > onak-mail.pl chmod +x onak-mail.pl +onak.conf: onak.conf.in + sed -e 's:@BINDIR@:@bindir@:g' \ + -e 's:@STATEDIR@:@localstatedir@:g' \ + < onak.conf.in > onak.conf + clean: $(RM) -f $(PROGS) $(OBJS) Makefile.bak testparse maxpath *.core core \ gpgwww.o add.o lookup.o main.o maxpath.o onak.o sixdegrees \ - sixdegrees.o splitkeys.o stripkey.o + sixdegrees.o splitkeys.o stripkey.o onak.conf distclean: clean $(RM) -f Makefile .depend config.{log,status,h} diff --git a/onak.conf b/onak.conf deleted file mode 100644 index 8668c80..0000000 --- a/onak.conf +++ /dev/null @@ -1,64 +0,0 @@ -# -# onak configuration file. Taken from pksd.conf as a starting point. -# - -pks_bin_dir /home/noodles/projects/onak/ -db_dir /home/noodles/pgp/db/ -logfile /home/noodles/pgp/onak.log -# Loglevel : 0 is highest debug, default is 3, nothing is 7+ -loglevel 0 - -### Set www_port to the port on which HTTP requests should be accepted. -### If you do not want to process HTTP requests, set this to 0. - -www_port 11371 -socket_name /community/pgp-keyserver/pksd_socket - -### Specify the envelope sender address as the -f argument to -### sendmail. This is the address which will receive any bounces. -### If you don't use sendmail, then change this to an equivalent command. -### If you do not want to process mail requests, leave this unset. - -mail_delivery_client /usr/sbin/sendmail -t -oi -fmailer-daemon - -### Set this to the address which should be displayed as the From: -### address in all outgoing email, and as the maintainer in the body -### of each message. - -maintainer_email PGP Key Server Administrator -mail_intro_file /community/pgp-keyserver/share/mail_intro -help_dir /community/pgp-keyserver/share -mail_dir /community/pgp-keyserver/incoming - -### If you change this, make sure to put a corresponding help file in -### the help_dir named above - -default_language EN - -### This is the email address of this site. It will be inserted in all -### outgoing incremental messages, so it should match whatever the -### downstream sites use as syncsite in their pksd.conf files. - -this_site pgp-public-keys@the.earth.li - -### Include a syncsite line for each site with which you are exchanging -### incremental requests. - -#syncsite pgp-public-keys@keys.nl.pgp.net -#syncsite pgp-public-keys@blackhole.pca.dfn.de -#syncsite pgp-public-keys@pgp.es.net -#syncsite pgp-public-keys@keyserver.linux.it -#syncsite pgp-public-keys@pgp.dtype.org -#syncsite pgp-public-keys@kjsl.com - -### Set this to 0 to disable mailserver LAST requests completely, to a -### positive integer to limit LAST requests to that many days, or -1 -### to allow any argument to LAST. - -max_last 1 - -### Set this to the maximum number of keys to return in the reply to -### an index, verbose index, get, or since reply. Setting it to -1 -### will allow any size reply. - -max_reply_keys 128 diff --git a/onak.conf.in b/onak.conf.in new file mode 100644 index 0000000..56533ce --- /dev/null +++ b/onak.conf.in @@ -0,0 +1,64 @@ +# +# onak configuration file. Taken from pksd.conf as a starting point. +# + +pks_bin_dir @BINDIR@ +db_dir @STATEDIR@/lib/onak +logfile @STATEDIR@/log/onak.log +# Loglevel : 0 is highest debug, default is 3, nothing is 7+ +loglevel 0 + +### Set www_port to the port on which HTTP requests should be accepted. +### If you do not want to process HTTP requests, set this to 0. + +www_port 11371 +socket_name /community/pgp-keyserver/pksd_socket + +### Specify the envelope sender address as the -f argument to +### sendmail. This is the address which will receive any bounces. +### If you don't use sendmail, then change this to an equivalent command. +### If you do not want to process mail requests, leave this unset. + +mail_delivery_client /usr/sbin/sendmail -t -oi -fmailer-daemon + +### Set this to the address which should be displayed as the From: +### address in all outgoing email, and as the maintainer in the body +### of each message. + +maintainer_email PGP Key Server Administrator +mail_intro_file /community/pgp-keyserver/share/mail_intro +help_dir /community/pgp-keyserver/share +mail_dir /community/pgp-keyserver/incoming + +### If you change this, make sure to put a corresponding help file in +### the help_dir named above + +default_language EN + +### This is the email address of this site. It will be inserted in all +### outgoing incremental messages, so it should match whatever the +### downstream sites use as syncsite in their pksd.conf files. + +this_site pgp-public-keys@the.earth.li + +### Include a syncsite line for each site with which you are exchanging +### incremental requests. + +#syncsite pgp-public-keys@keys.nl.pgp.net +#syncsite pgp-public-keys@blackhole.pca.dfn.de +#syncsite pgp-public-keys@pgp.es.net +#syncsite pgp-public-keys@keyserver.linux.it +#syncsite pgp-public-keys@pgp.dtype.org +#syncsite pgp-public-keys@kjsl.com + +### Set this to 0 to disable mailserver LAST requests completely, to a +### positive integer to limit LAST requests to that many days, or -1 +### to allow any argument to LAST. + +max_last 1 + +### Set this to the maximum number of keys to return in the reply to +### an index, verbose index, get, or since reply. Setting it to -1 +### will allow any size reply. + +max_reply_keys 128