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
Add trilium server and module #75047
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have only reviewed the nixos module. Further to the points mentioned below there are inconsistencies between your spelling trillium
vs trilium
.
9ee81be
to
7f59d7c
Compare
@aanderse Thanks very much for the quick review, I appreciate it :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For some reason, presumably user error 😕, my mobile browser seems to have lost one of the comments I made on this PR. So here we go again... sorry for the noise.
b42a4c3
to
947a723
Compare
@aanderse for some reason GH has recorded this message as a change request. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly fairly minor things at this point.
947a723
to
35fc57b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Module looks good to me! Thanks.
I haven't reviewed anything but the module so I'll wait for review from @dtzWill, @emmanuelrosa, or anyone else who cares to provide it. If no one jumps on this in the next couple days ping me and I'll take a look at the package changes.
@aanderse Thanks a lot for this comprehensive and instructive (also: timely ;) ) review ! |
I tested trilium-desktop and trilium-server. Both worked :) I used a NixOS container to install trilium-server and then connected from the host: trilium-container.nix
|
I forgot to mention that trilium-server is not logging to journald. Instead it's logging to a file in |
It is actually doing both, although not quite consistently (https://github.com/zadam/trilium/blob/c4d5060a0b9f2066e661725c6d32ed2f016b8b71/src/services/log.js). |
35fc57b
to
0137929
Compare
@emmanuelrosa I've added a patch for the server version that removes the file logger and logs to console only now. |
0137929
to
99878a1
Compare
4bccbb9
to
c96cd96
Compare
83c4b8d
to
a7db640
Compare
@GrahamcOfBorg build trilium-server |
Rebased against master and updated the package version once more. |
@kampka oops, sorry for the delay. I didn't notice the comments from @emmanuelrosa. Speaking of which... @emmanuelrosa do you mind hitting the approve button please? I took a very quick look over the package but I would like you as the listed maintainer to give it the official thumbs up. @kampka can you please address the |
@GrahamcOfBorg build trilium-desktop |
c32f9df
to
e1e76b8
Compare
@GrahamcOfBorg build trilium-desktop |
e1e76b8
to
ebf3f1f
Compare
@GrahamcOfBorg test trilium-server |
@aanderse sorry for the noise, the fact that ofBorg does an "empty" run on unsupported archs threw me of there. |
I don't have an approval button, but nevertheless, I approve :) |
I thought if you marked a package as
If you review a package you should have the ability to approve, comment, or request changes. Thank you for explicitly stating, though 😄 As an aside... you are marked as a maintainer for this package yet you aren't a member of the NixOS github project 🤔 If this is not by choice we should ping the maintainer of that code because it was my understanding that everyone listed as a maintainer was supposed to be added to the project at one point. Let me know if you want this corrected. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
Thanks @kampka! ...and sorry for the long drawn out process.
@aanderse, I was involved in developing the original package. I suppose that's why I'm listed as a maintainer. I'd be honored to be a member of the NixOS project. |
@aanderse @emmanuelrosa thanks for taking the time to review this guys 👍 |
@kampka no problem. Thanks for the contribution 🎉 |
Motivation for this change
This change adds the trilium server package and a module to run it.
It also refactors the trilium package as such so its easier to keep the metadata and version of both packages in sync.
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)Notify maintainers
cc @dtzWill @emmanuelrosa