3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-14 07:59:31 +01:00

ergonomadic -> oragono. I'm making lots of changes and this is AN EXPERIMENT. I want to differentiate this from Ergonomadic proper

This commit is contained in:
Daniel Oaks 2016-04-13 08:55:37 +10:00
parent 29d80366a6
commit c0c16c72f0
4 changed files with 22 additions and 37 deletions

View File

@ -1,20 +1,12 @@
Ergonomadic (anagram of "go IRC daemon") is an IRC daemon written from scratch Oragono is a very early, extremely experimental fork of the [Ergonomadic](https://github.com/edmund-huber/ergonomadic) IRC daemon. Ergonomadic looks cool, and this is something I can experiment on. Hopefully most of the stuff I do in this can be merged back into Ergonomadic! Also see the [mammon](https://github.com/mammon-ircd/mammon) IRC daemon for something similar written in Python.
in Go. Pull requests and issues are welcome.
Discussion at:
* host/port: irc.skub.club:6697, use SSL
* password: smellyoulater
* #darwin
# Features # Features
* follows the RFCs where possible
* UTF-8 nick and channel names * UTF-8 nick and channel names
* [yaml](http://yaml.org/) configuration * [yaml](http://yaml.org/) configuration
* server password (PASS command) * server password (PASS command)
* channels with most standard modes * channels with most standard modes
* IRC operators (OPER command) * IRC operators (OPER command)
* haproxy [PROXY protocol][proxy-proto] header for hostname setting
* passwords stored in [bcrypt][go-crypto] format * passwords stored in [bcrypt][go-crypto] format
* channels that [persist][go-sqlite] between restarts (+P) * channels that [persist][go-sqlite] between restarts (+P)
* messages are queued in the same order to all connected clients * messages are queued in the same order to all connected clients
@ -28,44 +20,37 @@ protect traffic, I recommend using
[PROXY protocol][proxy-proto]. This will allow the server to get the client's [PROXY protocol][proxy-proto]. This will allow the server to get the client's
original addresses for hostname lookups. original addresses for hostname lookups.
# What about federation?
IRC federation solves a problem that was more likely to occur on the internet of
1991 than today. We are exploring alternatives to federation that avoid nickname
and channel sync issues created during netsplits.
# Installation # Installation
```sh ```sh
go get go get
go install go install
cp ergonomadic.yaml ircd.yaml cp oragono.yaml ircd.yaml
vim ircd.yaml # modify the config file to your liking vim ircd.yaml # modify the config file to your liking
ergonomadic initdb oragono initdb
``` ```
# Configuration # Configuration
See the example [`ergonomadic.yaml`](ergonomadic.yaml). Passwords are base64-encoded bcrypted byte See the example [`oragono.yaml`](oragono.yaml). Passwords are base64-encoded bcrypted byte
strings. You can generate them with the `genpasswd` subcommand. strings. You can generate them with the `genpasswd` subcommand.
```sh ```sh
ergonomadic genpasswd oragono genpasswd
``` ```
# Running the server # Running the server
```sh ```sh
ergonomadic run oragono run
``` ```
# Credits # Credits
* Jeremy Latt, creator, <https://github.com/jlatt> * Jeremy Latt, creator of Ergonomadic, <https://github.com/jlatt>
* Edmund Huber, maintainer, <https://github.com/edmund-huber> * Edmund Huber, maintainer of Ergonomadic, <https://github.com/edmund-huber>
* Niels Freier, added WebSocket support, <https://github.com/stumpyfr> * Niels Freier, added WebSocket support to Ergonomadic, <https://github.com/stumpyfr>
* apologies to anyone I forgot. * apologies to anyone I forgot.
[go-crypto]: https://godoc.org/golang.org/x/crypto [go-crypto]: https://godoc.org/golang.org/x/crypto
[go-sqlite]: https://github.com/mattn/go-sqlite3 [go-sqlite]: https://github.com/mattn/go-sqlite3
[proxy-proto]: http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt

View File

@ -1,7 +1,7 @@
package irc package irc
const ( const (
SEM_VER = "ergonomadic-1.4.4" SEM_VER = "oragono-1.4.4"
CRLF = "\r\n" CRLF = "\r\n"
MAX_REPLY_LEN = 512 - len(CRLF) MAX_REPLY_LEN = 512 - len(CRLF)

View File

@ -5,21 +5,21 @@ import (
"log" "log"
"syscall" "syscall"
"github.com/DanielOaks/oragono/irc"
"github.com/docopt/docopt-go" "github.com/docopt/docopt-go"
"github.com/edmund-huber/ergonomadic/irc"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/crypto/ssh/terminal"
) )
func main() { func main() {
version := irc.SEM_VER version := irc.SEM_VER
usage := `ergonomadic. usage := `oragono.
Usage: Usage:
ergonomadic initdb [--conf <filename>] oragono initdb [--conf <filename>]
ergonomadic upgradedb [--conf <filename>] oragono upgradedb [--conf <filename>]
ergonomadic genpasswd [--conf <filename>] oragono genpasswd [--conf <filename>]
ergonomadic run [--conf <filename>] oragono run [--conf <filename>]
ergonomadic -h | --help oragono -h | --help
ergonomadic --version oragono --version
Options: Options:
--conf <filename> Configuration file to use [default: ircd.yaml]. --conf <filename> Configuration file to use [default: ircd.yaml].
-h --help Show this screen. -h --help Show this screen.

View File

@ -1,7 +1,7 @@
# ergonomadic IRCd config # oragono IRCd config
server: server:
# server name # server name
name: ergonomadic.test name: oragono.test
# database filename (sqlite db) # database filename (sqlite db)
database: ircd.db database: ircd.db
@ -16,7 +16,7 @@ server:
wslisten: ":8080" wslisten: ":8080"
# password to login to the server # password to login to the server
# generated using "ergonomadic genpasswd" # generated using "oragono genpasswd"
#password: "" #password: ""
# log level, one of error, warn, info, debug # log level, one of error, warn, info, debug
@ -30,5 +30,5 @@ operator:
# operator named 'dan' # operator named 'dan'
dan: dan:
# password to login with /OPER command # password to login with /OPER command
# generated using "ergonomadic genpasswd" # generated using "oragono genpasswd"
password: JDJhJDA0JE1vZmwxZC9YTXBhZ3RWT2xBbkNwZnV3R2N6VFUwQUI0RUJRVXRBRHliZVVoa0VYMnlIaGsu password: JDJhJDA0JE1vZmwxZC9YTXBhZ3RWT2xBbkNwZnV3R2N6VFUwQUI0RUJRVXRBRHliZVVoa0VYMnlIaGsu