GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

review fix

This commit is contained in:
Shivaram Lingamneni 2020-05-06 22:50:23 -04:00
parent 07fe28af95
commit 98b91e7bdd
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conventional.yaml
View File

@ -134,8 +134,9 @@ server:
motd-formatting: true
# addresses/CIDRs the PROXY command can be used from
# this should be restricted to 127.0.0.1/8 and ::1/128 (unless you have a good reason)
# you should also add these addresses to the connection limits and throttling exemption lists
# this should be restricted to localhost (127.0.0.1/8, ::1/128, and unix sockets),
# unless you have a good reason. you should also add these addresses to the
# connection limits and throttling exemption lists.
proxy-allowed-from:
- localhost
# - "192.168.1.1"

4
irc/server.go
View File

@ -601,6 +601,10 @@ func (server *Server) applyConfig(config *Config) (err error) {
newISupportReplies = oldConfig.Server.isupport.GetDifference(&config.Server.isupport)
}
if len(config.Server.ProxyAllowedFrom) != 0 {
server.logger.Info("server", "Proxied IPs will be accepted from", strings.Join(config.Server.ProxyAllowedFrom, ", "))
}
// we are now open for business
err = server.setupListeners(config)

5
oragono.yaml
View File

@ -155,8 +155,9 @@ server:
motd-formatting: true
# addresses/CIDRs the PROXY command can be used from
# this should be restricted to 127.0.0.1/8 and ::1/128 (unless you have a good reason)
# you should also add these addresses to the connection limits and throttling exemption lists
# this should be restricted to localhost (127.0.0.1/8, ::1/128, and unix sockets),
# unless you have a good reason. you should also add these addresses to the
# connection limits and throttling exemption lists.
proxy-allowed-from:
- localhost
# - "192.168.1.1"