free/freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Option to use an ssh pubkey during image creation

Browse Source
This commit is contained in:
Bob Mottram 2015-11-21 14:33:39 +00:00
parent df1c11802d
commit cc6dff68ed
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/freedombone-image
View File

@ -58,6 +58,9 @@ DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
# Minimum number of characters in a password # Minimum number of characters in a password
MINIMUM_PASSWORD_LENGTH=10 MINIMUM_PASSWORD_LENGTH=10
# Optional ssh public key to allow
SSH_PUBKEY="no"
while [[ $# > 1 ]] while [[ $# > 1 ]]
do do
key="$1" key="$1"
@ -91,6 +94,10 @@ case $key in
exit 3628 exit 3628
fi fi
;; ;;
--sshkey|--sshpubkey|--pubkey)
shift
SSH_PUBKEY="$1"
;;
-s|--size) -s|--size)
shift shift
IMAGE_SIZE="$1" IMAGE_SIZE="$1"
@ -169,7 +176,8 @@ make $IMAGE_TYPE \
NAMESERVER2="$NAMESERVER2" \ NAMESERVER2="$NAMESERVER2" \
PROJECT_NAME="$PROJECT_NAME" \ PROJECT_NAME="$PROJECT_NAME" \
CONFIG_FILENAME="$CONFIG_FILENAME" \ CONFIG_FILENAME="$CONFIG_FILENAME" \
IMAGE_SIZE="$IMAGE_SIZE" IMAGE_SIZE="$IMAGE_SIZE" \
SSH_PUBKEY="$SSH_PUBKEY"
shopt -s nullglob shopt -s nullglob
imgfiles=(build/${PROJECT_NAME}*.img) imgfiles=(build/${PROJECT_NAME}*.img)

18
src/freedombone-image-customise
View File

@ -47,6 +47,9 @@ NAMESERVER2='85.214.20.141'
# optional configuration file containing freedombone settings # optional configuration file containing freedombone settings
CONFIG_FILENAME= CONFIG_FILENAME=
# Optional ssh public key to allow
SSH_PUBKEY="no"
enable_eatmydata_override() { enable_eatmydata_override() {
chroot $rootdir apt-get install --no-install-recommends -y eatmydata chroot $rootdir apt-get install --no-install-recommends -y eatmydata
if [ -x $rootdir/usr/bin/eatmydata ] && \ if [ -x $rootdir/usr/bin/eatmydata ] && \
@ -149,6 +152,20 @@ To complete the installation run the following:
' > $rootdir/etc/init.d/motd ' > $rootdir/etc/init.d/motd
} }
configure_ssh {
if [[ "$SSH_PUBKEY" != "no" ]]; then
if [ ! -d $rootdir/home/$MY_USERNAME/.ssh ]; then
mkdir $rootdir/home/$MY_USERNAME/.ssh
fi
echo "$SSH_PUBKEY" > $rootdir/home/$MY_USERNAME/.ssh/authorized_keys
chroot $rootdir chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.ssh
sed -i 's|PasswordAuthentication.*|PasswordAuthentication no|g' $rootdir/etc/ssh/sshd_config
echo "Using ssh public key:"
echo $SSH_PUBKEY
echo 'Password ssh authentication turned off'
fi
}
continue_installation { continue_installation {
# If a configuration file exists then run with it # If a configuration file exists then run with it
# otherwise the interactive installer can be used # otherwise the interactive installer can be used
@ -252,6 +269,7 @@ fi
set_apt_sources $MIRROR set_apt_sources $MIRROR
chroot $rootdir apt-get update chroot $rootdir apt-get update
configure_ssh
configure_networking configure_networking
continue_installation continue_installation

2
src/freedombone-image-make
View File

@ -44,6 +44,7 @@ export NAMESERVER1
export NAMESERVER2 export NAMESERVER2
export PROJECT_NAME export PROJECT_NAME
export CONFIG_FILENAME export CONFIG_FILENAME
export SSH_PUBKEY
# Locate vmdebootstrap program fetched in Makefile # Locate vmdebootstrap program fetched in Makefile
basedir=`pwd` basedir=`pwd`
@ -137,6 +138,7 @@ sudo sed -i "s|NAMESERVER1=.*|NAMESERVER1=${NAMESERVER1}|g" $TEMP_CUSTOMISE
sudo sed -i "s|NAMESERVER2=.*|NAMESERVER2=${NAMESERVER1}|g" $TEMP_CUSTOMISE sudo sed -i "s|NAMESERVER2=.*|NAMESERVER2=${NAMESERVER1}|g" $TEMP_CUSTOMISE
sudo sed -i "s|PROJECT_NAME=.*|PROJECT_NAME=${PROJECT_NAME}|g" $TEMP_CUSTOMISE sudo sed -i "s|PROJECT_NAME=.*|PROJECT_NAME=${PROJECT_NAME}|g" $TEMP_CUSTOMISE
sudo sed -i "s|CONFIG_FILENAME=.*|CONFIG_FILENAME=${CONFIG_FILENAME}|g" $TEMP_CUSTOMISE sudo sed -i "s|CONFIG_FILENAME=.*|CONFIG_FILENAME=${CONFIG_FILENAME}|g" $TEMP_CUSTOMISE
sudo sed -i "s|SSH_PUBKEY=.*|SSH_PUBKEY=${SSH_PUBKEY}|g" $TEMP_CUSTOMISE
echo "starting $VMDEBOOTSTRAP" echo "starting $VMDEBOOTSTRAP"
# Run vmdebootstrap script to create image # Run vmdebootstrap script to create image