November 2010 - ngIRCd GIT Updates

Alexander Barton : contrib/ngircd-redhat.init: updated email address of Naoya Nakazawa
by alex＠arthur.barton.de 07 Nov '10

07 Nov '10

Module: ngircd.git Branch: master Commit: 29b41a4eccf024348631830d7fa087f88556f81a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=29b41a4e… Author: Alexander Barton <alex(a)barton.de> Date: Sun Nov 7 14:18:04 2010 +0100 contrib/ngircd-redhat.init: updated email address of Naoya Nakazawa --- contrib/ngircd-redhat.init | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/ngircd-redhat.init b/contrib/ngircd-redhat.init index f63eba7..9f133bd 100644 --- a/contrib/ngircd-redhat.init +++ b/contrib/ngircd-redhat.init @@ -1,7 +1,7 @@ #!/bin/sh # # ngIRCd start and stop script for RedHat based distributions. -# Written by Naoya Nakazawa <naoya(a)sanow.net> for CentOS 5.2, 2009. +# Written by Naoya Nakazawa <naoya.n(a)gmail.com> for CentOS 5.2, 2009. # # chkconfig: 2345 01 # description: ngIRCd is an Open Source server for \

1 0

Alexander Barton : Fix up generation and distribution of sample-ngircd.conf
by alex＠arthur.barton.de 03 Nov '10

03 Nov '10

Module: ngircd.git Branch: master Commit: 30b6e72b96e8092f3a0884b1a02eb403b8a4b12c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=30b6e72b… Author: Alexander Barton <alex(a)barton.de> Date: Wed Nov 3 23:47:21 2010 +0100 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 "/". --- doc/.gitignore | 1 + doc/Makefile.am | 28 ++++++++++++++++++++-------- doc/sample-ngircd.conf.tmpl | 10 +++++----- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 0000000..0035855 --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1 @@ +sample-ngircd.conf diff --git a/doc/Makefile.am b/doc/Makefile.am index 51fab0e..4b20e70 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -17,27 +17,39 @@ 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 -EXTRA_DIST = FAQ.txt GIT.txt Protocol.txt Platforms.txt README-AUX.txt \ - README-BeOS.txt RFC.txt Services.txt SSL.txt Zeroconf.txt \ - HowToRelease.txt sample-ngircd.conf +EXTRA_DIST = $(static_docs) $(doc_templates) + +CLEANFILES = $(generated_docs) maintainer-clean-local: rm -f Makefile Makefile.in -documents = $(EXTRA_DIST) ../AUTHORS ../COPYING ../ChangeLog ../INSTALL \ - ../NEWS ../README +all: $(generated_docs) -install-data-hook: $(documents) +install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) $(mkinstalldirs) $(DESTDIR)$(sysconfdir) 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 $(mkinstalldirs) $(DESTDIR)$(docdir) - for f in $(documents); do \ + for f in $(static_docs) $(toplevel_docs); do \ $(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \ done + for f in $(generated_docs); do \ + $(INSTALL) -m 644 -c $$f $(DESTDIR)$(docdir)/; \ + done uninstall-hook: rm -rf $(DESTDIR)$(docdir) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index c6dde60..12b688d 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -51,16 +51,16 @@ ;SSLPorts = 6697, 9999 # SSL Server Key - ;SSLKeyFile = :ETCDIR:ssl/server-key.pem + ;SSLKeyFile = :ETCDIR:/ssl/server-key.pem # password to decrypt SSLKeyFile (OpenSSL only) ;SSLKeyFilePassword = secret # SSL Server Key Certificate - ;SSLCertFile = :ETCDIR:ssl/server-cert.pem + ;SSLCertFile = :ETCDIR:/ssl/server-cert.pem # Diffie-Hellman parameters - ;SSLDHFile = :ETCDIR: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 = :ETCDIR: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 = :ETCDIR:#chan.key + ;KeyFile = :ETCDIR:/#chan.key # maximum users per channel (mode l) ;MaxUsers = 23

1 0

Florian Westphal : doc: change path names in sample-ngircd. conf depending on sysconfdir
by alex＠arthur.barton.de 03 Nov '10

03 Nov '10

Module: ngircd.git Branch: master Commit: 4a197638688d4e39d57f201ac735a38c9fc5a260 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4a197638… Author: Florian Westphal <fw(a)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(a)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

1 0

Florian Westphal : doc: change path names in sample-ngircd. conf depending on sysconfdir
by fw＠arthur.barton.de 03 Nov '10

03 Nov '10

Module: ngircd.git Branch: master Commit: 4a197638688d4e39d57f201ac735a38c9fc5a260 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=4a197638… Author: Florian Westphal <fw(a)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(a)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

1 0