-
Notifications
You must be signed in to change notification settings - Fork 2.8k
oragono: rename to ergo, Update to 2.10.0. #37645
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| #!/bin/sh | ||
| exec vlogger -t ergo |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| #!/bin/sh | ||
|
|
||
| [ -r ./conf ] && . ./conf | ||
|
|
||
| exec 2>&1 | ||
| exec chpst -u _ergo:_ergo ergo run --conf /etc/ergo.yaml |
36 changes: 22 additions & 14 deletions
36
srcpkgs/oragono/patches/paths.patch → srcpkgs/ergo/patches/paths.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,48 @@ | ||
| --- a/default.yaml 2021-01-30 22:19:08.000000000 -0500 | ||
| +++ b/default.yaml 2021-01-31 20:20:33.092293843 -0500 | ||
| @@ -50,8 +50,8 @@ | ||
| # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces: | ||
| ":6697": | ||
| diff --git i/default.yaml w/default.yaml | ||
| index 8da88e..4c3295 100644 | ||
| --- i/default.yaml | ||
| +++ w/default.yaml | ||
| @@ -52,8 +52,8 @@ server: | ||
| # this is a standard TLS configuration with a single certificate; | ||
| # see the manual for instructions on how to configure SNI | ||
| tls: | ||
| - cert: fullchain.pem | ||
| - key: privkey.pem | ||
| + cert: /var/lib/oragono/fullchain.pem | ||
| + key: /var/lib/oragono/privkey.pem | ||
| + cert: /var/lib/ergo/fullchain.pem | ||
| + key: /var/lib/ergo/privkey.pem | ||
| # 'proxy' should typically be false. It's for cloud load balancers that | ||
| # always send a PROXY protocol header ahead of the connection. See the | ||
| # manual ("Reverse proxies") for more details. | ||
| @@ -166,7 +166,7 @@ | ||
| @@ -169,7 +169,7 @@ server: | ||
|
|
||
| # motd filename | ||
| # if you change the motd, you should move it to ircd.motd | ||
| - motd: oragono.motd | ||
| + motd: /var/lib/oragono/motd | ||
| - motd: ergo.motd | ||
| + motd: /var/lib/ergo/motd | ||
|
|
||
| # motd formatting codes | ||
| # if this is true, the motd is escaped using formatting codes like $c, $b, and $i | ||
| @@ -714,7 +714,7 @@ | ||
| @@ -753,12 +753,12 @@ debug: | ||
| # started at once. comment out or set to the empty string ("") to disable. | ||
| # this path is relative to the working directory; if your datastore.path | ||
| # is absolute, you should use an absolute path here as well. | ||
| -lock-file: "ircd.lock" | ||
| +lock-file: "/var/lib/ergo/ircd.lock" | ||
|
|
||
| # datastore configuration | ||
| datastore: | ||
| # path to the datastore | ||
| - path: ircd.db | ||
| + path: /var/lib/oragono/db | ||
| + path: /var/lib/ergo/db | ||
|
|
||
| # if the database schema requires an upgrade, `autoupgrade` will attempt to | ||
| # perform it automatically on startup. the database will be backed | ||
| @@ -743,7 +743,7 @@ | ||
| @@ -790,7 +790,7 @@ languages: | ||
| default: en | ||
|
|
||
| # which directory contains our language files | ||
| - path: languages | ||
| + path: /usr/share/oragono/i18n | ||
| + path: /usr/share/ergo/i18n | ||
|
|
||
| # limits - these need to be the same across the network | ||
| limits: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| # Template file for 'ergo' | ||
| pkgname=ergo | ||
| version=2.10.0 | ||
| revision=1 | ||
| build_style=go | ||
| go_import_path="github.com/ergochat/ergo" | ||
| hostmakedepends="git" | ||
| short_desc="Modern IRC server (daemon/ircd) written in Go" | ||
| maintainer="Daniel Lewan <vision360.daniel@gmail.com>" | ||
| license="MIT" | ||
| homepage="https://ergo.chat/about" | ||
| distfiles="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/ergochat/ergo/archive/v${version}.tar.gz" | ||
| checksum=be3a93e8c0ca30f40a1d82e8b282ea36f4de98b8277c74a5fe4c6260f28dcfb4 | ||
| conf_files="/etc/ergo.yaml" | ||
| system_accounts="_ergo" | ||
| _ergo_homedir="/var/lib/ergo" | ||
| make_dirs=" | ||
| /var/lib/ergo 0755 _ergo _ergo" | ||
|
|
||
| post_install() { | ||
| vlicense LICENSE | ||
|
|
||
| vconf default.yaml ergo.yaml | ||
|
|
||
| for doc in docs/* | ||
| do | ||
| vdoc "$doc" | ||
| done | ||
|
|
||
| vmkdir usr/share/${pkgname} | ||
| vcopy ergo.motd usr/share/${pkgname}/default.motd | ||
|
|
||
| vmkdir usr/share/${pkgname}/i18n | ||
| vcopy "languages/*" usr/share/${pkgname}/i18n/ | ||
|
|
||
| vsv ergo | ||
| } | ||
|
|
||
| oragono_package() { | ||
| depends="${sourcepkg}>=${version}_${revision}" | ||
| build_style=meta | ||
| short_desc+=" (transitional dummy package)" | ||
| } | ||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
srcpkgs/oragono~42547d (oragono: rename to ergo, Update to 2.10.0.)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ergo |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.