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

Few fixes for Prosody service #40302

Closed
wants to merge 2 commits into from
Closed

Few fixes for Prosody service #40302

wants to merge 2 commits into from

Conversation

sshisk
Copy link
Contributor

@sshisk sshisk commented May 10, 2018

Motivation for this change

Errors when I enable s2s_secure_auth. Broken SQL storage backend.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@sshisk
prosody service: set cafile
7d761aa 
Fix s2s_secure_auth.
@sshisk
prosody: use lua 5.1
bb972c8 
Database storage plugins are broken with Lua 5.2.
@matthewbauer
Copy link
Member

Can you hardcode ssl certs with the cacert pckages.

@matthewbauer
Copy link
Member

@GrahamcOfBorg build prosody

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: prosody

Partial log (click to expand)

shrinking /nix/store/1q5digvacclwn644y31k22lcbvs00w7d-prosody-0.10.1/lib/prosody/util/ringbuffer.so
shrinking /nix/store/1q5digvacclwn644y31k22lcbvs00w7d-prosody-0.10.1/lib/prosody/util/table.so
gzipping man pages under /nix/store/1q5digvacclwn644y31k22lcbvs00w7d-prosody-0.10.1/share/man/
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/1q5digvacclwn644y31k22lcbvs00w7d-prosody-0.10.1/lib  /nix/store/1q5digvacclwn644y31k22lcbvs00w7d-prosody-0.10.1/bin
patching script interpreter paths in /nix/store/1q5digvacclwn644y31k22lcbvs00w7d-prosody-0.10.1
/nix/store/1q5digvacclwn644y31k22lcbvs00w7d-prosody-0.10.1/bin/.prosodyctl-wrapped: interpreter directive changed from "/usr/bin/env lua" to "/nix/store/4065mlb9qby6l8s8z5p2c2n93bp9lckj-lua-5.1.5/bin/lua"
/nix/store/1q5digvacclwn644y31k22lcbvs00w7d-prosody-0.10.1/bin/.prosody-wrapped: interpreter directive changed from "/usr/bin/env lua" to "/nix/store/4065mlb9qby6l8s8z5p2c2n93bp9lckj-lua-5.1.5/bin/lua"
checking for references to /build in /nix/store/1q5digvacclwn644y31k22lcbvs00w7d-prosody-0.10.1...
/nix/store/1q5digvacclwn644y31k22lcbvs00w7d-prosody-0.10.1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: prosody

Partial log (click to expand)

shrinking /nix/store/v7kljlpk6qjg1ykpsjbbn3c9cl3mw60m-prosody-0.10.1/lib/prosody/util/hashes.so
shrinking /nix/store/v7kljlpk6qjg1ykpsjbbn3c9cl3mw60m-prosody-0.10.1/lib/prosody/util/encodings.so
gzipping man pages under /nix/store/v7kljlpk6qjg1ykpsjbbn3c9cl3mw60m-prosody-0.10.1/share/man/
strip is /nix/store/jk6j4lh9v5mvjdbdc35sj0zffhhf6s56-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/v7kljlpk6qjg1ykpsjbbn3c9cl3mw60m-prosody-0.10.1/lib  /nix/store/v7kljlpk6qjg1ykpsjbbn3c9cl3mw60m-prosody-0.10.1/bin
patching script interpreter paths in /nix/store/v7kljlpk6qjg1ykpsjbbn3c9cl3mw60m-prosody-0.10.1
/nix/store/v7kljlpk6qjg1ykpsjbbn3c9cl3mw60m-prosody-0.10.1/bin/.prosodyctl-wrapped: interpreter directive changed from "/usr/bin/env lua" to "/nix/store/hkdb5m6rxmmabha6w7ksn3kjnb8m362c-lua-5.1.5/bin/lua"
/nix/store/v7kljlpk6qjg1ykpsjbbn3c9cl3mw60m-prosody-0.10.1/bin/.prosody-wrapped: interpreter directive changed from "/usr/bin/env lua" to "/nix/store/hkdb5m6rxmmabha6w7ksn3kjnb8m362c-lua-5.1.5/bin/lua"
checking for references to /build in /nix/store/v7kljlpk6qjg1ykpsjbbn3c9cl3mw60m-prosody-0.10.1...
/nix/store/v7kljlpk6qjg1ykpsjbbn3c9cl3mw60m-prosody-0.10.1

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: prosody

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@fpletz
Copy link
Member

fpletz commented Dec 17, 2018

Which SQL storage backend do you mean? The prosody NixOS test uses the regular SQL storage backend (storage ="sql") which seems to work.

@fpletz
Copy link
Member

fpletz commented Dec 17, 2018

The cafile fix is fine. This path is the canonical path for ca certificates on NixOS. I cherry-picked your cafile fix to master: 5a93f61

Closing this for now. Feel free to reopen if you still have problems with Lua 5.2.

@fpletz fpletz closed this Dec 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@sshisk @matthewbauer @GrahamcOfBorg @fpletz