Compare commits

..

No commits in common. "123d6e8ede01091357aeb58713a47640db663f34" and "eea969184a8e9bad36207c6f22357c52d72789ef" have entirely different histories.

2 changed files with 3 additions and 8 deletions

View File

@ -6,7 +6,6 @@ let
_boot = specialArgs._boot or { }; _boot = specialArgs._boot or { };
_services = specialArgs._services or { }; _services = specialArgs._services or { };
includeHardware = specialArgs.includeHardware or true; includeHardware = specialArgs.includeHardware or true;
proj_root = builtins.toString ./../..;
in in
with lib; with lib;
{ {
@ -37,7 +36,7 @@ with lib;
}; };
users.users.root = { users.users.root = {
# openssh runs in root, no? This is because port < 1024 requires root. # openssh runs in root, no? This is because port < 1024 requires root.
openssh.authorizedKeys.keys = lib.strings.splitString "\n" (builtins.readFile "${proj_root}/ssh/authorized_keys"); openssh.authorizedKeys.keys = lib.strings.splitString "\n" (builtins.readFile ../ssh/authorized_keys);
}; };
# Some basic programs # Some basic programs

View File

@ -7,12 +7,8 @@ set -xv
HOSTNAME=${1} HOSTNAME=${1}
if [ -z $HOSTNAME ]; then if [ -z $HOSTNAME ]; then
current_hostname=$(hostname) echo "Missing hostname as first param" 1>&2
echo "Missing hostname as first param." exit 1
echo "Type the hostname you want to be here"
read -p "[${current_hostname}] > " HOSTNAME
HOSTNAME=${HOSTNAME:-${current_hostname}}
read -p "Using hostname: ${HOSTNAME}. Press ENTER to continue." _WHATEVER_
fi fi
# Where is this script located # Where is this script located