From 4edd3198cd5f9b8dcc502c94f3967bc63188017f Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Fri, 23 Oct 2020 00:18:10 -0400 Subject: [PATCH 1/2] rename conventional.yaml -> traditional.yaml --- conventional.yaml => traditional.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename conventional.yaml => traditional.yaml (99%) diff --git a/conventional.yaml b/traditional.yaml similarity index 99% rename from conventional.yaml rename to traditional.yaml index c31a72d7..a0134ab4 100644 --- a/conventional.yaml +++ b/traditional.yaml @@ -1,4 +1,4 @@ -# This is the "conventional" or "mainstream" config file for Oragono. +# This is the "traditional" or "mainstream" config file for Oragono. # It tries to replicate the behavior of other ircds, at the cost of not # taking full advantage of Oragono's features. This config is suitable for use # in IRCv3 conformance testing. @@ -437,7 +437,7 @@ accounts: # parallel setting to force-nick-equals-account: if true, this forbids # anonymous users (i.e., users not logged into an account) to change their # nickname after the initial connection is complete - forbid-anon-nick-changes: false + forbid-anonymous-nick-changes: false # multiclient controls whether oragono allows multiple connections to # attach to the same client/nickname identity; this is part of the From dcb05ae0c292d4920adcb6a93f5739891d06878f Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Fri, 23 Oct 2020 00:27:55 -0400 Subject: [PATCH 2/2] update references to conventional.yaml --- .goreleaser.yml | 2 +- default.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 5a6e6ffd..ace7c597 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -46,7 +46,7 @@ archives: - CHANGELOG.md - oragono.motd - default.yaml - - conventional.yaml + - traditional.yaml - docs/* - languages/*.yaml - languages/*.json diff --git a/default.yaml b/default.yaml index 7440f00a..c404a71a 100644 --- a/default.yaml +++ b/default.yaml @@ -1,7 +1,7 @@ # This is the default config file for Oragono. # It contains recommended defaults for all settings, including some behaviors -# that differ from conventional ircds. See conventional.yaml for a config -# with more "mainstream" behavior. +# that differ from conventional ircd+services setups. See traditional.yaml +# for a config with more "mainstream" behavior. # # If you are setting up a new oragono server, you should copy this file # to a new one named 'ircd.yaml', then read the whole file to see which