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.

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

nixos/gitea: fix pre start script #44979

Merged
merged 1 commit into from Aug 31, 2018
Merged

nixos/gitea: fix pre start script #44979

merged 1 commit into from Aug 31, 2018

Conversation

Gerschtli
Copy link
Contributor

Motivation for this change

The gitea path is hardcoded in hooks directory in files of paths like:

repositories/<user>/<repo>.git/hooks/update.d/gitea

The locales can be updated on a new gitea release and therefore should be updated in the stateDir.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@nyanloutre
Copy link
Member

I had one problem, the cp -r created a directory at the wrong path :
conf/locale/locale instead of conf/locale
Also the mkdir seems redundant as cp can create it

@Gerschtli
Copy link
Contributor Author

Should be fixed now

@uvNikita
Copy link
Contributor

I'm not sure if it's relevant to this PR, but I'm running gitea on nixos 18.03 and currently, it's failing to start with this error message:

panic: fail to set message file(uk-UA): open conf/locale/locale_uk-UA.ini: no such file or directory

@nyanloutre
Copy link
Member

@uvNikita yes, this PR fix exactly this. For a quick fix you can run the command manually.

@Gerschtli
Copy link
Contributor Author

Gerschtli commented Aug 23, 2018 via email

@uvNikita
Copy link
Contributor

Great! Thanks for the explanation, I'll try to run the command manually for now.

@xeji
Copy link
Contributor

xeji commented Aug 29, 2018

Merge conflict because a similar fix was merged in #45608. I'm afraid this PR (which was first) was overlooked. Please close it if the issue is fixed now.

Thank you for contributing!

The gitea path is hardcoded in hooks directory in files of paths like:
    repositories/<user>/<repo>.git/hooks/update.d/gitea
@Gerschtli
Copy link
Contributor Author

Ah okay, I have updated the PR accordingly.

@xeji
Copy link
Contributor

xeji commented Aug 31, 2018

Thank you.

@xeji xeji merged commit 8f0bafc into NixOS:master Aug 31, 2018
@Gerschtli Gerschtli deleted the fix/gitea branch August 31, 2018 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants