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

Improve examples #250

Merged
merged 4 commits into from Oct 20, 2020
Merged

Improve examples #250

merged 4 commits into from Oct 20, 2020

Conversation

erikarvstedt
Copy link
Collaborator

No description provided.

The 'echo sudo' approach used previously failed when PATH or
NIX_PATH contains spaces. Exec the script with sudo instead.
@nixbitcoin
Copy link
Member

On Debian sysctl isn't available to non-root users, so ./deploy-container.sh yields

./deploy-container.sh: line 11: sysctl: command not found

It might also have to be run with sudo.

{ config, pkgs, lib, ... }: {
imports = [
<nix-bitcoin/modules/nix-bitcoin.nix>
<nix-bitcoin/modules/generate-secrets.nix>
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be <nix-bitcoin/modules/secrets/generate-secrets.nix>? I'm getting

error: file 'nix-bitcoin/modules/generate-secrets.nix' was not found in the Nix search path (add it using $NIX_PATH or -I), at /home/nix-bitcoin/nix-bitcoin/examples/minimal-configuration.nix:4:5

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks, this was an untested last-minute change. Fixed.

@erikarvstedt
Copy link
Collaborator Author

erikarvstedt commented Oct 19, 2020

The sysctl issue predates this PR. Fixed.

@erikarvstedt erikarvstedt force-pushed the examples branch 2 times, most recently from 0bb5fe5 to c1df4cb Compare October 19, 2020 17:24
Copy link
Member

@jonasnick jonasnick left a comment

Choose a reason for hiding this comment

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

uACK mod nit

README.md Show resolved Hide resolved
jonasnick
jonasnick previously approved these changes Oct 20, 2020
Copy link
Member

@jonasnick jonasnick left a comment

Choose a reason for hiding this comment

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

ACK 5d32218

exec nix-shell --run "./${BASH_SOURCE[0]##*/} $*"
fi

if [[ $(sysctl -n net.ipv4.ip_forward || sudo sysctl -n net.ipv4.ip_forward) != 1) ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

remove ) in != 1)

Copy link
Member

@nixbitcoin nixbitcoin left a comment

Choose a reason for hiding this comment

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

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

ACK b574cb097f27e82fdcfa39b5705855993a600464
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEV3o0Un8+KoXoD+Fk3RH5rVMIs7oFAl+OwA0ACgkQ3RH5rVMI
s7qEaxAAzHrwuL4n19ncL9nAh1Zg9wC6QYUGWHFJ7O1Lc/SE24c8DdyJpikMbDBe
EuaFiCXDscy2rl60md56HESjRteJJQDnrXCNKL3hGodWbwtzIACYH4N1W8+XoqUI
Sc/QFoE5p16Zr2AOAdwspRVfn6SMsC0cxety47HzpMcxL+LJGtWom5eBcZzF8UCd
t5rMMYLdJ1s6ruZlJpY06FtasDztHbGkbim8zM7SVqVIQftvNAYmzq53q4FGPM27
7+s9KtzdAGF3EmGJRL+wgxLvydzlCgoscYJzaOEPym2CK7jdtpB4qftxXTCrKbeR
RfNeGBzGk9EC+QX5ak4VyQrdz9e1VtxecrMH0ekxhFfxsNNlhJK0OZMuzQSO3p8F
xQXUG+LC4DEZB9W538tYn4BcxYuIGDuRo6kO1OWWv4cUyMdWlj3a4sBIE1x3fZ9z
siOvMJAVt20CvP9ttVtgKHRxiLSntKLLdtvHzztshOebDyRs4ANXGThy+7/QwK9M
M8aDmb2CvXQBupzQldY1unmPM3I+ETBjGbEQLEqHzlH4ZDb69A3aYdQwgMNySguN
LbrHw7SRgXRBT8fUi1jDIWz7D1ATdJlZKxsr0f503GdYk7+m+fvFGpfeRxwrcD7l
r0eA8aMpS23DQu/heHxIkk+/SGJBRYc6dZiYiBHWC5J3aigk9x0=
=ZTyn
-----END PGP SIGNATURE-----

@jonasnick jonasnick merged commit 5ec9ea1 into fort-nix:master Oct 20, 2020
@erikarvstedt erikarvstedt deleted the examples branch December 15, 2020 21:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants