bluepython508/frajtano
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use portable hostname - macos doesn't have /etc/hostname

Browse Source
This commit is contained in:
bluepython508
2024-09-26 12:23:27 +01:00
parent b0643a760e
commit 6944ff05e0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.envrc
View File

@@ -1,5 +1,5 @@
use flake use flake
export RELEASE_NODE=frajtano-test@$(cat /etc/hostname) export RELEASE_NODE=frajtano-test@$(hostname -s)
export FRAJTANO_DIR=$PWD/.frajtano_state export FRAJTANO_DIR=$PWD/.frajtano_state
export FRAJTANO_CONFIG=$PWD/config/config.exs export FRAJTANO_CONFIG=$PWD/config/config.exs

2
default.nix
View File

@@ -41,7 +41,7 @@
file="$FRAJTANO_DIR/cookie" file="$FRAJTANO_DIR/cookie"
(umask 077; [ -f "$file" ] || ${pkgs.coreutils}/bin/head -c 128 /dev/urandom | ${pkgs.coreutils}/bin/base64 -w0 > "$file") (umask 077; [ -f "$file" ] || ${pkgs.coreutils}/bin/head -c 128 /dev/urandom | ${pkgs.coreutils}/bin/base64 -w0 > "$file")
export RELEASE_COOKIE=$(${pkgs.coreutils}/bin/cat "$file") export RELEASE_COOKIE=$(${pkgs.coreutils}/bin/cat "$file")
[ -z $RELEASE_NODE ] && export RELEASE_NODE="frajtano-$(${pkgs.coreutils}/bin/whoami)@$(${pkgs.coreutils}/bin/cat /etc/hostname)" [ -z $RELEASE_NODE ] && export RELEASE_NODE="frajtano-$(${pkgs.coreutils}/bin/whoami)@$(${pkgs.toybox}/bin/hostname -s)"
run() { run() {
exec ${lib.getExe pkg} "$@" exec ${lib.getExe pkg} "$@"
} }