Module: ngircd.git Branch: master Commit: 4a197638688d4e39d57f201ac735a38c9fc5a260 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4a1976386... Author: Florian Westphal <fw@strlen.de> Date: Mon Nov 1 23:47:04 2010 +0100 doc: change path names in sample-ngircd.conf depending on sysconfdir --- doc/Makefile.am | 9 ++++++++- ...{sample-ngircd.conf => sample-ngircd.conf.tmpl} | 12 ++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 1e5773e..51fab0e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -10,6 +10,13 @@ # der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. # +.tmpl: + sed \ + -e s@:ETCDIR:@${sysconfdir}@ \ + <$< >$@ + +SUFFIXES = .tmpl + SUBDIRS = src EXTRA_DIST = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \ @@ -22,7 +29,7 @@ maintainer-clean-local: documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \ ../NEWS ../README -install-data-hook: +install-data-hook: $(documents) $(mkinstalldirs) $(DESTDIR)$(sysconfdir) if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ $(INSTALL) -m 600 -c $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \ diff --git a/doc/sample-ngircd.conf b/doc/sample-ngircd.conf.tmpl similarity index 97% rename from doc/sample-ngircd.conf rename to doc/sample-ngircd.conf.tmpl index fe34dff..c6dde60 100644 --- a/doc/sample-ngircd.conf +++ b/doc/sample-ngircd.conf.tmpl @@ -42,7 +42,7 @@ ;AdminInfo1 = Description ;AdminInfo2 = Location ;AdminEMail = admin@irc.server - + # Ports on which the server should listen. There may be more than # one port, separated with ",". (Default: 6667) ;Ports = 6667, 6668, 6669 @@ -51,16 +51,16 @@ ;SSLPorts = 6697, 9999 # SSL Server Key - ;SSLKeyFile = /usr/local/etc/ngircd/ssl/server-key.pem + ;SSLKeyFile = :ETCDIR:ssl/server-key.pem # password to decrypt SSLKeyFile (OpenSSL only) ;SSLKeyFilePassword = secret # SSL Server Key Certificate - ;SSLCertFile = /usr/local/etc/ngircd/ssl/server-cert.pem + ;SSLCertFile = :ETCDIR:ssl/server-cert.pem # Diffie-Hellman parameters - ;SSLDHFile = /usr/local/etc/ngircd/ssl/dhparams.pem + ;SSLDHFile = :ETCDIR:ssl/dhparams.pem # comma separated list of IP addresses on which the server should # listen. Default values are: @@ -77,7 +77,7 @@ # Text file with the "message of the day" (MOTD). This message will # be shown to all users connecting to the server: - ;MotdFile = /usr/local/etc/ngircd.motd + ;MotdFile = :ETCDIR:ngircd.motd # A simple Phrase (<256 chars) if you don't want to use a motd file. ;MotdPhrase = "Hello world!" @@ -270,7 +270,7 @@ # Key file, syntax for each line: "<user>:<nick>:<key>". # Default: none. - ;KeyFile = /etc/ngircd/#chan.key + ;KeyFile = :ETCDIR:#chan.key # maximum users per channel (mode l) ;MaxUsers = 23