diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 24 | ||||
| -rw-r--r-- | doc/Modes.txt | 4 | ||||
| -rw-r--r-- | doc/sample-ngircd.conf.tmpl | 9 |
3 files changed, 30 insertions, 7 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 92e019b8..3bf68fb4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -52,8 +52,8 @@ all: $(generated_docs) install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) $(mkinstalldirs) $(DESTDIR)$(sysconfdir) - if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ - $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \ + @if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ + make install-config; \ fi $(mkinstalldirs) $(DESTDIR)$(docdir) for f in $(static_docs) $(toplevel_docs); do \ @@ -63,10 +63,30 @@ install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) $(INSTALL) -m 644 -c $$f $(DESTDIR)$(docdir)/; \ done +install-config: + $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf + @echo; \ + echo " ** NOTE: Installed sample configuration file:"; \ + echo " ** \"$(DESTDIR)$(sysconfdir)/ngircd.conf\""; \ + echo + uninstall-hook: rm -rf $(DESTDIR)$(docdir) + @if cmp --silent sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; then \ + make uninstall-config; \ + else \ + echo; \ + echo " ** NOTE: Not uninstalling changed configuration file:"; \ + echo " ** \"$(DESTDIR)$(sysconfdir)/ngircd.conf\""; \ + echo; \ + fi + +uninstall-config: + rm -f $(DESTDIR)$(sysconfdir)/ngircd.conf srcdoc: make -C src srcdoc +.PHONY: install-config uninstall-config srcdoc + # -eof- diff --git a/doc/Modes.txt b/doc/Modes.txt index d61bd2d0..dec80ce8 100644 --- a/doc/Modes.txt +++ b/doc/Modes.txt @@ -2,7 +2,7 @@ ngIRCd - Next Generation IRC Server http://ngircd.barton.de/ - (c)2001-2011 Alexander Barton and Contributors. + (c)2001-2012 Alexander Barton and Contributors. ngIRCd is free software and published under the terms of the GNU General Public License. @@ -22,6 +22,7 @@ channels he is using at the moment. mode since description a 0.3.0 User is away. + B 20 User is flagged as a "bot". c 17 IRC operator wants to receive connect/disconnect NOTICEs. C 19 Only users that share a channel are allowed to send messages. i 0.0.1 User is "invisible". @@ -49,6 +50,7 @@ users to lists (e.g. "invite list", "ban list"), others have parameters k 0.6.0 Channel has a "key" (a password). l 0.6.0 Channel has a user limit. m 0.3.0 Channel is moderated, only "voiced" users can send messages. + M 20 Only registered users (and IRC Ops) can send messages. n 0.3.0 Channel doesn't allow messages of users not being members. O 18 Only IRC operators are allowed to join this channel. P 0.5.0 Channel is "persistent". diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index 6d9d7709..57e65892 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -297,15 +297,16 @@ # Connect to the remote server using TLS/SSL (Default: false) ;SSLConnect = yes - # Define a (case insensitive) mask matching nick names that should be - # treated as IRC services when introduced via this remote server. + # Define a (case insensitive) list of masks matching nick names that + # should be treated as IRC services when introduced via this remote + # server, separated by commas (","). # REGULAR SERVERS DON'T NEED this parameter, so leave it empty # (which is the default). # When you are connecting IRC services which mask as a IRC server # and which use "virtual users" to communicate with, for example # "NickServ" and "ChanServ", you should set this parameter to - # something like "*Serv". - ;ServiceMask = *Serv + # something like "*Serv" or "NickServ,ChanServ,XyzServ". + ;ServiceMask = *Serv,Global [Server] # More [Server] sections, if you like ... |