Skip to content

Add defaults to config cheatsheet, and minor language cleanup. #3290

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

Merged
merged 4 commits into from
Jan 6, 2018
Merged

Add defaults to config cheatsheet, and minor language cleanup. #3290

merged 4 commits into from
Jan 6, 2018

Conversation

MTecknology
Copy link
Contributor

This change adds a default setting to each configuration option present in the cheat sheet. It also cleans up some of the language and grammar.

@codecov-io
Copy link

codecov-io commented Jan 3, 2018

Codecov Report

Merging #3290 into master will increase coverage by 0.19%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3290      +/-   ##
==========================================
+ Coverage   34.67%   34.86%   +0.19%     
==========================================
  Files         278      278              
  Lines       40506    40506              
==========================================
+ Hits        14044    14124      +80     
+ Misses      24395    24298      -97     
- Partials     2067     2084      +17
Impacted Files Coverage Δ
models/repo.go 43.37% <0%> (ø) ⬆️
models/repo_list.go 67.18% <0%> (+1.56%) ⬆️
models/lfs.go 28.26% <0%> (+2.17%) ⬆️
modules/lfs/server.go 35.01% <0%> (+14.32%) ⬆️
modules/lfs/content_store.go 43.75% <0%> (+35.93%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 52d93f7...6bc153e. Read the comment docs.

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 3, 2018
- `WHITELISTED_URIS`: Space separated list of POSIX regexp patterns. If non empty OpenID URIs should match any of these to be granted access.
- `BLACKLISTED_URIS`: Space separated list of POSIX regexp pattenrs. OpenID URI matching any of these is refused access.
- `ENABLE_OPENID_SIGNIN`: **false**: Allow authentication in via OpenID.
- `ENABLE_OPENID_SIGNUP`: **! DISABLE\_REGISTRATION**: Allow registering via OpenID.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here the exclamation mark has nothing to do with the importance of knowing what you're doing. Rather it's negating the DISABLE_REGISTRATION setting. I'm mentioning becuase I found it weird to read that meaning of the mark at the top of the file

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it might make the most sense to remove the use of :exclamation: since it's only used for two settings, and the mark doesn't actually render anyway. Those two options can easily have a small note added about not fiddling with them.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you didn't get it: it's nothing about the risk in fiddling with them. Exclamation mark only means NEGATING the value of the following value. So ENABLE_OPENID_SIGNUP is FALSE when DISABLE_REGISTRATION is TRUE and vice-versa.

- `ENABLE_OPENID_SIGNIN`: **false**: Allow authentication in via OpenID.
- `ENABLE_OPENID_SIGNUP`: **! DISABLE\_REGISTRATION**: Allow registering via OpenID.
- `WHITELISTED_URIS`: **\<none\>**: If non-empty, list of POSIX regex patterns matching OpenID URI's to permit.
- `BLACKLISTED_URIS`: **\<none\>**: If non-empty, list of POSIX regex pattenrs matching OpenID URI's to block.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also if empty, would be the empty list.... This is different from WHITELISTED_URL in that an empty list would NOT mean to allow NOBODY but rather to allow ALL.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this just a problem with using the <none>? Would it be better to s/none/empty/?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a problem with the wording If non-empty, which is not needed for BLACKLISTED_URIS. There's no difference in behavior when the value is EMPTY. Also please mind the typos

- `LEVEL`: General log level, default is `Trace`.
- `ROOT_PATH`: **\<none\>**: Root path for log files.
- `MODE`: **console**: Logging mode. For multiple modes, use a comma to separate values.
- `LEVEL`: **Trace**: General log level.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

allowed levels are ?

Copy link
Member

@strk strk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the effort, if you can improve the spots I commented about will LGTM :)

Copy link
Member

@strk strk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still LGTM beside nitpicking :)

@@ -84,12 +82,12 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
- `DISABLE_ROUTER_LOG`: **false**: Mutes printing of the router log.
- `CERT_FILE`: **custom/https/cert.pem**: Cert file path used for HTTPS.
- `KEY_FILE`: **custom/https/key.pem**: Key file path used for HTTPS.
- `STATIC_ROOT_PATH`: **./**Upper level of template and static files path.
- `STATIC_ROOT_PATH`: **./**: Upper level of template and static files path.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would be useful to specify what . is relative to, in this case. Directory containing executable file ? Directory from which the command was run ?

@tboerger tboerger added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jan 4, 2018
Copy link
Member

@techknowlogick techknowlogick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same nitpicks as @strk, but LGTM otherwise

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jan 4, 2018
@lunny lunny added this to the 1.4.0 milestone Jan 5, 2018
@lunny lunny added the type/docs This PR mainly updates/creates documentation label Jan 5, 2018
@lafriks lafriks merged commit 70b6c07 into go-gitea:master Jan 6, 2018
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/docs This PR mainly updates/creates documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants