albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix up generation and distribution of sample-ngircd.conf 

- Add generated sample-ngircd.conf to new .gitignore file,
- refactor Makefile.am to generate sample-ngircd.conf on "make all",
  to clean it up on "make clean", and to install it to the correct place.
- Make sure path names in sample-ngircd.conf are separated by "/".
This commit is contained in:
Alexander Barton 2010-11-03 23:47:21 +01:00
parent 4a19763868
commit 30b6e72b96
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
sample-ngircd.conf

28
doc/Makefile.am
View File

@ -17,27 +17,39 @@
SUFFIXES = .tmpl SUFFIXES = .tmpl
static_docs = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \
README-BeOS.txt RFC.txt Services.txt SSL.txt Zeroconf.txt \
HowToRelease.txt
doc_templates = sample-ngircd.conf.tmpl
generated_docs = sample-ngircd.conf
toplevel_docs = ../AUTHORS ../COPYING ../ChangeLog ../INSTALL ../NEWS ../README
SUBDIRS = src SUBDIRS = src
EXTRA_DIST = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \ EXTRA_DIST = $(static_docs) $(doc_templates)
README-BeOS.txt RFC.txt Services.txt SSL.txt Zeroconf.txt \
HowToRelease.txt sample-ngircd.conf CLEANFILES = $(generated_docs)
maintainer-clean-local: maintainer-clean-local:
rm -f Makefile Makefile.in rm -f Makefile Makefile.in
documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \ all: $(generated_docs)
../NEWS ../README
install-data-hook: $(documents) install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs)
$(mkinstalldirs) $(DESTDIR)$(sysconfdir) $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \
$(INSTALL) -m 600 -c $(srcdir)/sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \ $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \
fi fi
$(mkinstalldirs) $(DESTDIR)$(docdir) $(mkinstalldirs) $(DESTDIR)$(docdir)
for f in $(documents); do \ for f in $(static_docs) $(toplevel_docs); do \
$(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \ $(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \
done done
for f in $(generated_docs); do \
$(INSTALL) -m 644 -c $$f $(DESTDIR)$(docdir)/; \
done
uninstall-hook: uninstall-hook:
rm -rf $(DESTDIR)$(docdir) rm -rf $(DESTDIR)$(docdir)

10
doc/sample-ngircd.conf.tmpl
View File

@ -51,16 +51,16 @@
;SSLPorts = 6697, 9999 ;SSLPorts = 6697, 9999
# SSL Server Key # SSL Server Key
;SSLKeyFile = :ETCDIR:ssl/server-key.pem ;SSLKeyFile = :ETCDIR:/ssl/server-key.pem
# password to decrypt SSLKeyFile (OpenSSL only) # password to decrypt SSLKeyFile (OpenSSL only)
;SSLKeyFilePassword = secret ;SSLKeyFilePassword = secret
# SSL Server Key Certificate # SSL Server Key Certificate
;SSLCertFile = :ETCDIR:ssl/server-cert.pem ;SSLCertFile = :ETCDIR:/ssl/server-cert.pem
# Diffie-Hellman parameters # Diffie-Hellman parameters
;SSLDHFile = :ETCDIR:ssl/dhparams.pem ;SSLDHFile = :ETCDIR:/ssl/dhparams.pem
# comma separated list of IP addresses on which the server should # comma separated list of IP addresses on which the server should
# listen. Default values are: # listen. Default values are:
@ -77,7 +77,7 @@
# Text file with the "message of the day" (MOTD). This message will # Text file with the "message of the day" (MOTD). This message will
# be shown to all users connecting to the server: # be shown to all users connecting to the server:
;MotdFile = :ETCDIR:ngircd.motd ;MotdFile = :ETCDIR:/ngircd.motd
# A simple Phrase (<256 chars) if you don't want to use a motd file. # A simple Phrase (<256 chars) if you don't want to use a motd file.
;MotdPhrase = "Hello world!" ;MotdPhrase = "Hello world!"
@ -270,7 +270,7 @@
# Key file, syntax for each line: "<user>:<nick>:<key>". # Key file, syntax for each line: "<user>:<nick>:<key>".
# Default: none. # Default: none.
;KeyFile = :ETCDIR:#chan.key ;KeyFile = :ETCDIR:/#chan.key
# maximum users per channel (mode l) # maximum users per channel (mode l)
;MaxUsers = 23 ;MaxUsers = 23