Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Sample config: update LOCAL_ROOT_URL description for PROTOCOL = 'unix' case #3760

Merged
merged 2 commits into from
May 22, 2018
Merged

Sample config: update LOCAL_ROOT_URL description for PROTOCOL = 'unix' case #3760

merged 2 commits into from
May 22, 2018

Conversation

Siosm
Copy link

@Siosm Siosm commented Apr 4, 2018

Update the sample configuration description for the LOCAL_ROOT_URL
configuration variable to mention the special case required if PROTOCOL
is set to 'unix'.

Fixes #3741.

@codecov-io
Copy link

codecov-io commented Apr 4, 2018 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (master@d97bb95). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #3760   +/-   ##
=========================================
  Coverage          ?   20.05%           
=========================================
  Files             ?      153           
  Lines             ?    30344           
  Branches          ?        0           
=========================================
  Hits              ?     6086           
  Misses            ?    23345           
  Partials          ?      913

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 d97bb95...3481317. Read the comment docs.

@bkcsoft bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 4, 2018
techknowlogick
techknowlogick requested changes May 21, 2018
View reviewed changes
custom/conf/app.ini.sample Outdated
@@ -122,6 +122,8 @@ UNIX_SOCKET_PERMISSION = 666
; Local (DMZ) URL for Gitea workers (such as SSH update) accessing web service.
; In most cases you do not need to change the default value.
; Alter it only if your SSH server node is not the same as HTTP node.
; If you set PROTOCOL to 'unix', you must comment this variable or set it to
; 'http://unix/'
LOCAL_ROOT_URL = %(PROTOCOL)s://%(HTTP_ADDR)s:%(HTTP_PORT)s/
Copy link
Member

Choose a reason for hiding this comment

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

Can you also update the docs page that references the setting: https://docs.gitea.io/en-us/config-cheat-sheet/

Copy link
Member

@daviian daviian May 21, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I suggest: "Don't set this variable if PROTOCOL is 'unix'"

@techknowlogick techknowlogick added the type/docs This PR mainly updates/creates documentation label May 21, 2018
@techknowlogick techknowlogick added this to the 1.6.0 milestone May 21, 2018
@Siosm
Copy link
Author

Siosm commented May 21, 2018

Updated and rebased on master.

@lafriks lafriks modified the milestones: 1.6.0, 1.5.0 May 21, 2018
@bkcsoft bkcsoft 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 May 21, 2018
@Siosm
Copy link
Author

Siosm commented May 21, 2018

Re-updated with a slightly simpler formulation more in line with other doc comments.

@bkcsoft bkcsoft 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 May 21, 2018
@travier
doc: update LOCAL_ROOT_URL description for PROTOCOL = 'unix' case
d9bc392 
Update the sample configuration and config cheat sheet description for
the LOCAL_ROOT_URL configuration variable to mention the special case
required if PROTOCOL is set to 'unix'.

Fixes #3741.

Signed-off-by: Timothée Ravier <tim@siosm.fr>
@Siosm
Copy link
Author

Siosm commented May 21, 2018

Typo fix for 'unix' -> unix and re-updated my repo as something strange happened.

@lunny lunny merged commit b3a3024 into go-gitea:master May 22, 2018
@zettar zettar mentioned this pull request Nov 6, 2018
Closed
6 tasks
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@lafriks lafriks lafriks approved these changes

@daviian daviian daviian approved these changes

Assignees
No one assigned
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
Milestone
1.5.0
Development

Successfully merging this pull request may close these issues.

Unix socket: cannot pull/push over SSH
8 participants
@Siosm @codecov-io @techknowlogick @lafriks @daviian @lunny @bkcsoft @travier