diff options
| author | zeripath <art27@cantab.net> | 2020-08-15 21:15:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-15 21:15:27 +0100 |
| commit | ac3cfad23dc08f24d2bb8914313162e281de7326 (patch) | |
| tree | 113514441fdaeeecafadcb11346ad589e7f91c5a /modules/setting | |
| parent | ee97e6a66a7bec9547af31c93a5eef7c19a32c54 (diff) | |
| download | gitea-ac3cfad23dc08f24d2bb8914313162e281de7326.tar.gz gitea-ac3cfad23dc08f24d2bb8914313162e281de7326.zip | |
Make the default PID file compile-time settable (#12485)
#12391 offered to change the default PID file from /var/run/gitea.pid however in discussion it was decided that this could break users of older systems. An alternative was offered that we could make the PID file compile/link time settable.
This PR does this, and changes the name of the setting from CustomPID to simply PIDFile. It also updates the from-source docs to show how to change the compiler settings to do this.
Closes #12391
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Florian Klink <flokli@flokli.de>
Diffstat (limited to 'modules/setting')
| -rw-r--r-- | modules/setting/setting.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index d4ce13079a..d77df2d75f 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -382,7 +382,8 @@ var ( Cfg *ini.File CustomPath string // Custom directory path CustomConf string - CustomPID string + PIDFile = "/var/run/gitea.pid" + WritePIDFile bool ProdMode bool RunUser string IsWindows bool @@ -535,8 +536,8 @@ func SetCustomPathAndConf(providedCustom, providedConf, providedWorkPath string) func NewContext() { Cfg = ini.Empty() - if len(CustomPID) > 0 { - createPIDFile(CustomPID) + if WritePIDFile && len(PIDFile) > 0 { + createPIDFile(PIDFile) } if com.IsFile(CustomConf) { |