restructuring done

master
lars 18 years ago
parent 6cfc58e36e
commit c04ef0cc69

@ -75,7 +75,7 @@ TEMPLATE_DIR="cbox-tree.d"
IMAGE_FILE="$BUILDDIR/cryptobox.iso"
# dfsbuild config
CONFIG="dfs.cbox.conf"
CONFIG=$(get_config_file dfs.cbox.conf)
# temporary directory
TMP_DIR="/tmp/`basename $0`-$$"
@ -243,7 +243,7 @@ function merge_from_devel()
# get the diff of a running cryptobox system between its current state
# and its original content
function devel_diff(
function devel_diff()
{
ssh -F "$SSH_CONFIG_FILE" "$SSH_HOST" "$DEVEL_FEATURES_SCRIPT" diff
}

@ -3,7 +3,7 @@ the files in this directory are examples specific hook scripts to change the
configuration of the box
2) How to use these scripts
Copy the scripts, you would like to use into local.conf.d/custom-configure.d.
Copy the scripts, you would like to use into 'configure-local.d'.
They will be sourced in alphabetic order AFTER the default configuration of the
cryptobox.
@ -17,9 +17,7 @@ set_root_pw
cryptobox for testing has to be publicly available
import_authorized_keys
- create a new rsa key (local.conf.d/id_rsa) and copy the public
- create a new rsa key (etc-local.d/id_rsa) and copy the public
key to the working image directory
- IMPORTANT: you have to activate the 'IdentityFile' setting in
local.conf.d/ssh-options to enable this feature
- this is useful, if you secured the development cryptobox with a
password (see 'set_root_pw')

@ -1,9 +1,9 @@
# import a public rsa key into the cryptobox for ssh authentication
#
# see README in misc/custom-configure.d for details
# see README in configure-examples.d for details
#
# do not forget to activate the 'IdentityFile' setting in
# local.conf.d/ssh-options
# etc-local.d/ssh_config
#
SSH_KEY_FILE="$LOCALCONF_DIR/id_rsa"
@ -16,7 +16,6 @@ if [ ! -e "$SSH_KEY_FILE" ]
fi
# copy new public ssh key to ~/.ssh/authorized_keys on cryptobox
check_ssh_defaults
echo "Copying local public ssh key file to the box ..."
mkdir -p "$IMAGE_DIR/opt/dfsbuild/runtimerd/root/.ssh"
cp "${SSH_KEY_FILE}.pub" "$IMAGE_DIR/opt/dfsbuild/runtimerd/root/.ssh/authorized_keys"

@ -5,8 +5,8 @@ HostName 192.168.0.23
Port 22
# maybe you want to use rsa authentication?
# see misc/custom-configure.s/README for examples
#IdentityFile local.conf.d/id_rsa
# see configure-examples.d/README for examples
IdentityFile local.conf.d/id_rsa
# this should be valid for everyone
User root

Loading…
Cancel
Save