chaos/docker-salt-master
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve ssh configuration

Browse Source
This commit is contained in:
Carlos Álvaro
2018-11-09 23:34:40 +01:00
parent e81ef4a471
commit c488f305cd
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
assets/build/install.sh
View File

@@ -47,3 +47,10 @@ echo "Installing saltstack ..."
wget -O bootstrap-salt.sh https://bootstrap.saltstack.com wget -O bootstrap-salt.sh https://bootstrap.saltstack.com
sh bootstrap-salt.sh ${SALT_BOOTSTRAP_OPTS} stable ${SALT_VERSION} sh bootstrap-salt.sh ${SALT_BOOTSTRAP_OPTS} stable ${SALT_VERSION}
chown -R ${SALT_USER}: ${SALT_ROOT_DIR} chown -R ${SALT_USER}: ${SALT_ROOT_DIR}
# Configure ssh
echo "Configuring ssh ..."
sed -i -e "s|^[# ]*StrictHostKeyChecking.*$| StrictHostKeyChecking no|" /etc/ssh/ssh_config
echo " UserKnownHostsFile /dev/null" >> /etc/ssh/ssh_config
echo " LogLevel ERROR" >> /etc/ssh/ssh_config
echo "# IdentityFile salt_ssh_key" >> /etc/ssh/ssh_config

39
assets/runtime/functions.sh
View File

@@ -33,15 +33,15 @@ function gen_signed_keys()
} }
# This function repairs keys permissions and creates keys if neaded # This function repairs keys permissions and creates keys if neaded
function setup_keys() function setup_salt_keys()
{ {
echo "Setting up keys..." echo "Setting up keys ..."
sed -i \ sed -i \
-e "s|^[#]*master_sign_pubkey:.*$|# master_sign_pubkey -> overrided|" \ -e "s|^[# ]*master_sign_pubkey:.*$|# master_sign_pubkey -> Overrided, see Custom Settings|" \
-e "s|^[#]*master_sign_key_name:.*$|# master_sign_key_name -> overrided|" \ -e "s|^[# ]*master_sign_key_name:.*$|# master_sign_key_name -> Overrided, see Custom Settings|" \
-e "s|^[#]*master_pubkey_signature:.*$|# master_pubkey_signature -> overrided|" \ -e "s|^[# ]*master_pubkey_signature:.*$|# master_pubkey_signature -> Overrided, see Custom Settings|" \
-e "s|^[#]*master_use_pubkey_signature:.*$|# master_use_pubkey_signature -> overrided|" \ -e "s|^[# ]*master_use_pubkey_signature:.*$|# master_use_pubkey_signature -> Overrided, see Custom Settings|" \
${SALT_ROOT_DIR}/master ${SALT_ROOT_DIR}/master
cat >> ${SALT_ROOT_DIR}/master <<EOF cat >> ${SALT_ROOT_DIR}/master <<EOF
@@ -55,12 +55,12 @@ master_use_pubkey_signature: ${SALT_MASTER_USE_PUBKEY_SIGNATURE}
EOF EOF
if [ ! -f ${SALT_KEYS_DIR}/master.pem ]; then if [ ! -f ${SALT_KEYS_DIR}/master.pem ]; then
echo "Generating keys..." echo "Generating keys ..."
salt-key --gen-keys master --gen-keys-dir ${SALT_KEYS_DIR} salt-key --gen-keys master --gen-keys-dir ${SALT_KEYS_DIR}
fi fi
if [ ! -f "${SALT_KEYS_DIR}/${SALT_MASTER_SIGN_KEY_NAME}.pem" ] && [ ${SALT_MASTER_SIGN_PUBKEY} == True ]; then if [ ! -f "${SALT_KEYS_DIR}/${SALT_MASTER_SIGN_KEY_NAME}.pem" ] && [ ${SALT_MASTER_SIGN_PUBKEY} == True ]; then
echo "Generating signed keys..." echo "Generating signed keys ..."
salt-key --gen-signature --auto-create --pub ${SALT_KEYS_DIR}/master.pub --signature-path ${SALT_KEYS_DIR} salt-key --gen-signature --auto-create --pub ${SALT_KEYS_DIR}/master.pub --signature-path ${SALT_KEYS_DIR}
fi fi
@@ -76,21 +76,14 @@ EOF
find ${SALT_HOME} -path ${SALT_KEYS_DIR}/\* -prune -o -print0 | xargs -0 chown -h ${SALT_USER}: find ${SALT_HOME} -path ${SALT_KEYS_DIR}/\* -prune -o -print0 | xargs -0 chown -h ${SALT_USER}:
} }
# This function configures ssh settings # This function configures ssh keys
function configure_ssh() function setup_ssh_keys()
{ {
echo "Configuring ssh..." echo "Configuring ssh ..."
mkdir -p "/root/.ssh" sed -i \
cat > "/root/.ssh/config" <<EOF -e "s|^[# ]*IdentityFile salt_ssh_key$| IdentityFile ${SALT_KEYS_DIR}/${SALT_GITFS_SSH_PRIVATE_KEY}|" \
Host * /etc/ssh/ssh_config
IdentityFile ${SALT_KEYS_DIR}/${SALT_GITFS_SSH_PRIVATE_KEY}
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
LogLevel ERROR
EOF
chmod 600 "/root/.ssh/config"
if [[ -f "${SALT_KEYS_DIR}/${SALT_GITFS_SSH_PRIVATE_KEY}" ]]; then if [[ -f "${SALT_KEYS_DIR}/${SALT_GITFS_SSH_PRIVATE_KEY}" ]]; then
chmod 600 "${SALT_KEYS_DIR}/${SALT_GITFS_SSH_PRIVATE_KEY}" chmod 600 "${SALT_KEYS_DIR}/${SALT_GITFS_SSH_PRIVATE_KEY}"
@@ -156,6 +149,6 @@ function initialize_system()
map_uidgid map_uidgid
initialize_datadir initialize_datadir
configure_salt_master configure_salt_master
setup_keys setup_salt_keys
configure_ssh setup_ssh_keys
} }