Commit Graph

98 Commits

Author SHA1 Message Date
J-P Nurmi
2b18d6ee38 Merge pull request #1020 from jpnurmi/traffic
Calculate per-network traffic (#963)
2015-09-02 01:01:13 +02:00
Alexey Sokolov
9688727f32 Add a possibility (not an "option") to disable launch after --makeconf
See #257
2015-08-24 21:22:14 +01:00
J-P Nurmi
66053e24ff Add CZNC::GetNetworkTrafficStats() 2015-08-22 01:27:23 +02:00
J-P Nurmi
d19a040f2d Remove flawed Add/Del/List/BindHost(s) (close #983) 2015-08-17 15:35:29 +02:00
J-P Nurmi
2417ca68a8 Prefer Contains() over find() != npos 2015-08-14 13:55:11 +02:00
J-P Nurmi
4995e7517e Prefer StartsWith(s) over Left(n) == s 2015-08-14 13:51:44 +02:00
J-P Nurmi
475acd8f00 Prefer TrimPrefix() over Left() + LeftChomp() 2015-08-14 12:29:42 +02:00
Alexey Sokolov
71fc592bfa Merge pull request #1019 from jpnurmi/ssl
CZNC: add missing SSL-related getters and setters
2015-08-07 09:26:43 +01:00
Gustavo Zacarias
9a51195e91 Add <time.h> includes where appropiate
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
2015-08-06 11:20:54 -03:00
J-P Nurmi
a13b4a8e46 CZNC: add missing SSL-related getters and setters
- SSLCiphers
- SSLProtocols
- SSLCertFile
2015-08-05 01:05:46 +02:00
J-P Nurmi
d39b20b505 Fix sources to include their respective header 2015-07-14 19:05:23 +02:00
Alexey Sokolov
70cc4285f9 Merge branch '1.6.x' 2015-04-06 20:43:41 +01:00
Alexey Sokolov
4596d97502 Remove "-" between "ZNC" and version number.
ZNC 1.6.0 looks better than ZNC - 1.6.0, IMHO
2015-04-06 20:41:57 +01:00
Thomas Kriechbaumer
8d2ca76838 fail if no config version is not found 2015-03-31 14:29:08 +01:00
Thomas Kriechbaumer
d542599475 add compatibility for pre-1.0 configs 2015-03-31 14:29:08 +01:00
Thomas Kriechbaumer
a56d4cae6a do not call OnAddUser hook during ZNC startup 2015-03-31 12:15:40 +01:00
Thomas Kriechbaumer
28bb50fa1a refactor config parsing 2015-03-31 12:15:40 +01:00
J-P Nurmi
3a951b2b6d CZNC: use member initialization list [-Weffc++] (#270) 2015-03-01 16:03:59 +01:00
Alexey Sokolov
e9294e4c81 Merge pull request #898 from jpnurmi/nullptr
Search'n'replace remaining NULL occurrences (#816)
2015-02-26 21:18:37 -08:00
J-P Nurmi
75b210e841 Search'n'replace remaining NULL occurrences (#816) 2015-02-26 20:58:01 +01:00
J-P Nurmi
b0ddd5082e CZNC: C++11 range-based for loops 2015-02-26 11:53:42 +01:00
J-P Nurmi
6002bd5c2b Remove unnecessary virtual keyword occurrences
This makes it convenient to 'grep virtual' and 'grep override' :)
2015-02-25 18:33:09 +01:00
J-P Nurmi
ef9939e1ec Add override (#816)
Changes applied by 'clang-modernize -add-override [...]'
2015-02-25 09:24:00 +01:00
J-P Nurmi
70c0ffb10b Use nullptr (#816)
Changes applied by 'clang-modernize -use-nullptr [...]'
2015-02-25 09:20:20 +01:00
Alexey Sokolov
f9a4507669 Add a global setting whether to show ZNC version or not
Close #820
Close #821
2015-01-30 23:01:06 +00:00
Falk Seidel
2e29d49a53 Welcome to 2015 2014-12-31 11:28:38 +01:00
J-P Nurmi
b759c68847 Config option for SSL protocols (resolves #720)
ZNC currently disables SSLv2 and SSLv3 by default. To keep the ZNC
defaults (recommended, may change in the future versions) and for
example disable TLSv1 in addition, specify in the global config
section:

    SSLProtocols = -TLSv1

Available (case-insentive) values are:

    All, SSLv2, SSLv3, TLSv1, TLSv1.1, TLSv1.2

A non-prefixed "absolute" value overrides the ZNC defaults:

    SSLProtocols = TLSV1 +TLSv1.1 +TLSv1.2
2014-11-06 23:49:49 +01:00
Alexey Sokolov
19b4dbdaba Merge pull request #717 from jpnurmi/ssl-ciphers
Resolve #621: Config option for allowed SSL ciphers
2014-10-26 20:50:52 +00:00
J-P Nurmi
3d57ccb738 Resolve #621: Config option for allowed SSL ciphers
In the global section, for example:

    SSLCiphers = ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS

https://www.openssl.org/docs/apps/ciphers.html
https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers
2014-10-26 14:59:36 +01:00
Alexey Sokolov
e337cb433d Merge commit 'refs/pull/665/head' of github.com:znc/znc 2014-10-26 12:17:31 +00:00
Alexey Sokolov
4562f1c67b Merge commit 'refs/pull/705/head' of github.com:znc/znc 2014-10-26 11:44:35 +00:00
J-P Nurmi
ba64324a39 Introduce patch level version number for bug fix releases
The patch level version number is ignored in module and config
version compatibility checks. Radically simplified, bug fix
releases shall not touch the headers nor change the config file.
2014-10-20 07:45:58 +02:00
J-P Nurmi
206c149f48 Scheduling of quiet vs. verbose config saving
Rename the current ECONFIG_NEED_WRITE to ECONFIG_NEED_VERBOSE_WRITE
as it always broadcasts the result for SIGUSR1, even on success.
Keep ECONFIG_NEED_WRITE for cases where the config should be written
without a notification of success.
2014-10-20 06:55:02 +02:00
Uli Schlachter
7704bc49d7 client auth: Switch from CSmartPtr to std::shared_ptr
Signed-off-by: Uli Schlachter <psychon@znc.in>
2014-09-12 15:12:46 +02:00
J-P Nurmi
e45aa48a91 makeconf: limit the upper bound for allowed port to 65534
Safari/WebKit: "Not allowed to use restricted network port"
2014-09-09 00:01:08 +02:00
J-P Nurmi
fec4d20ace makeconf: revise the output and reduce the noise
Long "would you like ZNC to..." questions are slow to read.
Use short and pithy prompts, and try to fit the line width to
less than 80 characters. Furthermore, Remove Word Capitalization.
2014-09-08 23:36:58 +02:00
J-P Nurmi
2d868a892c makeconf: offer freenode by default 2014-09-08 23:32:20 +02:00
J-P Nurmi
1c72af7d2d makeconf: change the channel input loop to a one-liner
The "would you like to add a channel?" ... "would you like to add
another channel?" loop is very verbose and slow to use. This proposal
makes it a simple one-liner where the user can enter a bunch of chans
using any combination of space/comma/semi-colon as a separator, or
just hit enter to proceed without channels...
2014-09-08 23:10:20 +02:00
J-P Nurmi
b1451a28c4 makeconf: one admin user is enough to get started
Webadmin is more convenient and enabled by default since 7387f00.
2014-09-08 22:47:32 +02:00
J-P Nurmi
bc2c7d0c98 makeconf: one network is enough to get started
Webadmin is more convenient and enabled by default since 7387f00.
2014-09-08 16:52:04 +02:00
J-P Nurmi
44c3a04462 makeconf: one server is enough to get started
Webadmin is more convenient and enabled by default since 7387f00.
2014-09-08 16:52:04 +02:00
J-P Nurmi
40aa1bb34d makeconf: promote webadmin 2014-09-07 22:57:13 +02:00
J-P Nurmi
25609ec0bb makeconf: improve alternate location handling 2014-09-07 22:57:12 +02:00
J-P Nurmi
6ec56778e5 makeconf: just warn if the config exists
Don’t require typing yes to continue, it’s inconvenient.
2014-09-07 22:57:12 +02:00
J-P Nurmi
a489304a0e makeconf: offer SSL by default if the port is 6697 2014-09-07 22:57:12 +02:00
J-P Nurmi
69e38cafe2 makeconf: use username instead of nick as ident
Username and ident are more likely to match.
2014-09-07 22:57:12 +02:00
J-P Nurmi
139282fe38 makeconf: kill buffer and chan mode questions
Use webadmin/controlpanel to configure buffers and default chan modes
2014-09-07 21:25:07 +02:00
J-P Nurmi
c087355c48 makeconf: fix indentation of LoadModule lines
7387f00 missed the tabs
2014-09-03 23:47:06 +02:00
J-P Nurmi
7387f00408 Get rid of the module questions during --makeconf
The following modules are enabled by default:
- global: webadmin
- user: controlpanel, chansaver
- network: simple_away

This reduces a lot makeconf noise and fixes #541.
2014-08-17 15:37:50 +02:00
J-P Nurmi
fb0dcc0dd9 Make --makeconf warn early about an existing config (#572) 2014-08-11 10:37:26 +02:00