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

misc: Minor improvements

Browse Source
This commit is contained in:
Carlos Álvaro
2021-11-28 18:40:51 +01:00
parent 568ed091a7
commit 1fae94f6f1
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/runtime/functions.sh
View File

@@ -217,6 +217,7 @@ function configure_salt_master()
#---------------------------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------------------------
function configure_salt_api() function configure_salt_api()
{ {
rm -f /etc/supervisor/conf.d/salt-api.conf
[[ ${SALT_API_SERVICE_ENABLED} == true ]] || return 0 [[ ${SALT_API_SERVICE_ENABLED} == true ]] || return 0
if [[ -n "${SALT_API_USER}" ]]; then if [[ -n "${SALT_API_USER}" ]]; then

6
entrypoint.sh
View File

@@ -3,7 +3,9 @@
set -e set -e
set -o pipefail set -o pipefail
source "${SALT_RUNTIME_DIR}/functions.sh" # shellcheck source=assets/runtime/functions.sh
FUNCTIONS_FILE="${SALT_RUNTIME_DIR}/functions.sh"
source "${FUNCTIONS_FILE}"
[[ "${DEBUG}" == true ]] && set -x [[ "${DEBUG}" == true ]] && set -x
@@ -28,7 +30,7 @@ case "${1}" in
case "${1}" in case "${1}" in
salt-master|salt-api) salt-master|salt-api)
echo "Restarting ${1} service ..." echo "Restarting ${1} service ..."
exec pkill "${1}" exec supervisorctl restart "${1}"
;; ;;
*) *)
log_error "Unable to restart ${1} serice. Service is unknown" log_error "Unable to restart ${1} serice. Service is unknown"

6
tests/gitfs/test.sh
View File

@@ -13,7 +13,7 @@ COMMON_FILE="${SCRIPT_PATH}/../lib/common.sh"
source "${COMMON_FILE}" source "${COMMON_FILE}"
trap cleanup EXIT trap cleanup EXIT
export GITFS_KEYS_DIR=${GITFS_KEYS_DIR:-tests/gitfs/data/keys/gitfs} export GITFS_KEYS_DIR=${GITFS_KEYS_DIR:-"${SCRIPT_PATH}/data/keys/gitfs"}
# Check gitfs keys are present # Check gitfs keys are present
echo "==> Checking gitfs keys are present ..." echo "==> Checking gitfs keys are present ..."
@@ -25,8 +25,8 @@ ok "gitfs keys"
# Run test instance # Run test instance
echo "==> Starting docker-salt-master (${PLATFORM}) with RSA 4096 ssh key ..." echo "==> Starting docker-salt-master (${PLATFORM}) with RSA 4096 ssh key ..."
start_container_and_wait \ start_container_and_wait \
--volume "$(pwd)/tests/gitfs/config":/home/salt/data/config:ro \ --volume "${SCRIPT_PATH}/config":/home/salt/data/config:ro \
--volume "$(pwd)/${GITFS_KEYS_DIR%%/gitfs}":/home/salt/data/keys \ --volume "${GITFS_KEYS_DIR%%/gitfs}":/home/salt/data/keys \
|| error "container started" || error "container started"
ok "container started" ok "container started"

2
tests/lib/common.sh
View File

@@ -30,7 +30,7 @@ export BOOTUP_WAIT_SECONDS=${BOOTUP_WAIT_SECONDS:-60}
#---------------------------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------------------------
function cleanup() function cleanup()
{ {
echo "==> Removing ${CONTAINER_NAME} ..." echo "🧹 Removing ${CONTAINER_NAME} ..."
docker container rm --force "${CONTAINER_NAME}" docker container rm --force "${CONTAINER_NAME}"
} }

2
tests/salt-api/test.sh
View File

@@ -31,7 +31,7 @@ external_auth:
- '@wheel' - '@wheel'
- '@jobs' - '@jobs'
EOF EOF
echo "salt-api config created ✅" ok "salt-api config created"
# Run test instance # Run test instance
echo "==> Starting docker-salt-master (${PLATFORM}) with salt-api config ..." echo "==> Starting docker-salt-master (${PLATFORM}) with salt-api config ..."