From c04ef0cc69c8cecb577de02691557453133fbbe2 Mon Sep 17 00:00:00 2001 From: lars Date: Wed, 3 Aug 2005 23:26:53 +0000 Subject: [PATCH] restructuring done --- cbox-build.sh | 4 ++-- .../custom-configure.d => configure-examples.d}/README | 6 ++---- .../import_authorized_keys | 5 ++--- .../custom-configure.d => configure-examples.d}/set_root_pw | 0 etc-defaults.d/ssh_config | 4 ++-- 5 files changed, 8 insertions(+), 11 deletions(-) rename {etc-defaults.d/custom-configure.d => configure-examples.d}/README (73%) rename {etc-defaults.d/custom-configure.d => configure-examples.d}/import_authorized_keys (87%) rename {etc-defaults.d/custom-configure.d => configure-examples.d}/set_root_pw (100%) diff --git a/cbox-build.sh b/cbox-build.sh index 8dd379d..a381826 100755 --- a/cbox-build.sh +++ b/cbox-build.sh @@ -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 } diff --git a/etc-defaults.d/custom-configure.d/README b/configure-examples.d/README similarity index 73% rename from etc-defaults.d/custom-configure.d/README rename to configure-examples.d/README index acd170f..736939a 100644 --- a/etc-defaults.d/custom-configure.d/README +++ b/configure-examples.d/README @@ -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') diff --git a/etc-defaults.d/custom-configure.d/import_authorized_keys b/configure-examples.d/import_authorized_keys similarity index 87% rename from etc-defaults.d/custom-configure.d/import_authorized_keys rename to configure-examples.d/import_authorized_keys index 008b10b..824ab44 100644 --- a/etc-defaults.d/custom-configure.d/import_authorized_keys +++ b/configure-examples.d/import_authorized_keys @@ -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" diff --git a/etc-defaults.d/custom-configure.d/set_root_pw b/configure-examples.d/set_root_pw similarity index 100% rename from etc-defaults.d/custom-configure.d/set_root_pw rename to configure-examples.d/set_root_pw diff --git a/etc-defaults.d/ssh_config b/etc-defaults.d/ssh_config index de831bd..4e78e56 100644 --- a/etc-defaults.d/ssh_config +++ b/etc-defaults.d/ssh_config @@ -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