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

Jump to bottom

shellhub-agent: Add service and package expressions #104419

Merged
merged 3 commits into from Dec 30, 2020
Merged

shellhub-agent: Add service and package expressions #104419

merged 3 commits into from Dec 30, 2020

Conversation

otavio
Copy link
Contributor

@otavio otavio commented Nov 20, 2020 •
edited

Motivation for this change

We aim to ease the use of ShellHub and NixOS is one of the distros we'd like to support. It is working very well on our machines.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from kalbasit November 20, 2020 21:51
SuperSandro2000
SuperSandro2000 reviewed Nov 20, 2020
View reviewed changes
pkgs/applications/networking/shellhub-agent/default.nix Outdated Show resolved Hide resolved
pkgs/applications/networking/shellhub-agent/default.nix Show resolved Hide resolved
pkgs/applications/networking/shellhub-agent/default.nix Outdated Show resolved Hide resolved
pkgs/applications/networking/shellhub-agent/default.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/shellhub-agent.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/shellhub-agent.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/shellhub-agent.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/shellhub-agent.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/shellhub-agent.nix Show resolved Hide resolved
nixos/modules/services/networking/shellhub-agent.nix Show resolved Hide resolved
@otavio otavio force-pushed the topic/shellhub branch 2 times, most recently from c3c1c74 to 6bb01ef Compare November 21, 2020 02:59
@otavio
Copy link
Contributor Author

otavio commented Nov 21, 2020

@SuperSandro2000 I succeed in clean it. Please do another review on this when you have time. Thanks for all the comments.

SuperSandro2000
SuperSandro2000 reviewed Nov 21, 2020
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

I am not that familiar with modules so someone else should take a look at it.

pkgs/applications/networking/shellhub-agent/default.nix Outdated Show resolved Hide resolved
@otavio
Copy link
Contributor Author

otavio commented Dec 5, 2020

Is there anything else pending for this PR?

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 104419 run on x86_64-darwin 1

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 104419 run on x86_64-linux 1

1 package blacklisted:
  • tests.nixos-functions.nixos-test
1 package built:
  • shellhub-agent

@otavio
Copy link
Contributor Author

otavio commented Dec 22, 2020

Hello all, I rebased this on top of master to resolve the conflict. Could someone take a look at this?

jonringer
jonringer reviewed Dec 26, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

I would break out the package and service into 2 different ocmmits:

shellhub-agent: init at 0.4.2
nixos/shellhub-agent: init

nixos/modules/services/networking/shellhub-agent.nix Outdated Show resolved Hide resolved
pkgs/applications/networking/shellhub-agent/default.nix Show resolved Hide resolved
@otavio
maintainer-list: add otavio
c95a08d 
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
@otavio
shellhub-agent: initial expression at 0.4.2
f5d54c8 
ShellHub is a modern SSH server for remotely accessing Linux devices via
command line (using any SSH client) or web-based user interface,
designed as an alternative to _sshd_.

Think ShellHub as centralized SSH for the the edge and cloud computing.

More information about the project in:

 - https://shellhub.io
 - https://github.com/shellhub-io/shellhub

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
jonringer
jonringer approved these changes Dec 28, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

cc @Mic92 or @infinisil for final look-over of module

@otavio
nixos/shellhub-agent: initial service expression
06edbab 
This provides the service to configure the ShellHub Agent.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
infinisil
infinisil approved these changes Dec 30, 2020
View reviewed changes
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

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

That's great, thanks :)

@infinisil infinisil merged commit ff97a25 into NixOS:master Dec 30, 2020
@otavio otavio deleted the topic/shellhub branch December 31, 2020 00:18
@otavio otavio mentioned this pull request Dec 31, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aanderse aanderse aanderse left review comments

@jonringer jonringer jonringer approved these changes

@infinisil infinisil infinisil approved these changes

@kalbasit kalbasit Awaiting requested review from kalbasit

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@otavio @SuperSandro2000 @jonringer @aanderse @infinisil @Janik-Haag