diff options
| author | Alexander Barton <alex@barton.de> | 2011-06-26 15:24:07 +0200 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2011-06-26 15:24:07 +0200 |
| commit | 3282c1325e491f2fbc7ee388c557f40e1f9eaed6 (patch) | |
| tree | b08d854ae7e35eb55294314aed076897f543205a /src/testsuite | |
| parent | b1786f309ecc29216a8d0b919cd514c8f69f24bf (diff) | |
| parent | 3d0ce77f12117df9e12d364c725c3c54332901bd (diff) | |
| download | ngircd-3282c1325e491f2fbc7ee388c557f40e1f9eaed6.tar.gz ngircd-3282c1325e491f2fbc7ee388c557f40e1f9eaed6.zip | |
Merge branch 'newconfig'
* newconfig: sample-ngircd.conf: "SyslogFacility" should be commented out Move SSL-related configuration variables to new [SSL] section CheckFileReadable(): only check when a filename is given ... PAM: make clear which "Password" config option is ignored Really remove [Features] in our manual pages INSTALL: document changed location of configuration variables Update sample config file and manual page for new config structure Testsuite: update configuration files for new config file format Display configuration errors more prominent on "--configtest" conf.c: code cleanup Check for redability of SSL-related files like for MOTD file Restructure ngIRCd configuration, introduce [Limits] and [Options]
Diffstat (limited to 'src/testsuite')
| -rw-r--r-- | src/testsuite/ngircd-test1.conf | 6 | ||||
| -rw-r--r-- | src/testsuite/ngircd-test2.conf | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/testsuite/ngircd-test1.conf b/src/testsuite/ngircd-test1.conf index 43851f65..f65f7065 100644 --- a/src/testsuite/ngircd-test1.conf +++ b/src/testsuite/ngircd-test1.conf @@ -7,11 +7,13 @@ Ports = 6789 MotdFile = ngircd-test1.motd AdminEMail = admin@irc.server + +[Limits] MaxConnectionsIP = 0 - OperCanUseMode = yes MaxJoins = 4 -[Features] +[Options] + OperCanUseMode = yes Ident = no PAM = no diff --git a/src/testsuite/ngircd-test2.conf b/src/testsuite/ngircd-test2.conf index 54c1232d..5d2e28f2 100644 --- a/src/testsuite/ngircd-test2.conf +++ b/src/testsuite/ngircd-test2.conf @@ -7,11 +7,13 @@ Ports = 6790 MotdFile = ngircd-test2.motd AdminEMail = admin@irc.server2 + +[Limits] MaxConnectionsIP = 0 - OperCanUseMode = yes MaxJoins = 4 -[Features] +[Options] + OperCanUseMode = yes Ident = no PAM = no |