From 5ac2e4842d68bb8f8e1ec27d38cf254e6f075abd Mon Sep 17 00:00:00 2001 From: pvincent Date: Wed, 9 Oct 2024 09:02:10 +0400 Subject: [PATCH] provided by --- lib/functions.sh | 2 +- recipes/dolibarr/crud.sh | 2 +- recipes/mariadb/install.sh | 2 +- scripts/miaou | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/functions.sh b/lib/functions.sh index 0a822df..4e64127 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -384,7 +384,7 @@ function join() { builtin echo "$*" } -# execute remote scripting onto one LXC container [COMMANDS, ...] +# execute remote scripting over one LXC container [COMMANDS, ...] # may use one command like: `lxc_exec ct1 uname -a` # or pipe like so: ` # cat </dev/null - echo "copying configuration files onto container <$container>... " + echo "copying configuration files to container <$container>... " lxc file push --uid 0 --gid 0 "$MIAOU_CONFIGDIR/apps/dolibarr/$shortname/host.conf" "$container/etc/nginx/sites-available/$longname.conf" echo "copying files over container <$container> ... OK" diff --git a/recipes/mariadb/install.sh b/recipes/mariadb/install.sh index 9a3e6ce..181df0b 100755 --- a/recipes/mariadb/install.sh +++ b/recipes/mariadb/install.sh @@ -34,7 +34,7 @@ function install() { echowarn "initializing ..." launch_container "$CONTAINER" build_device_backup - echowarn "executing various commands onto container <$CONTAINER>, please be patient ..." + echowarn "executing various commands inside container <$CONTAINER>, please be patient ..." lxc exec "$CONTAINER" -- bash </dev/null diff --git a/scripts/miaou b/scripts/miaou index d397dab..d209651 100755 --- a/scripts/miaou +++ b/scripts/miaou @@ -466,7 +466,7 @@ function prepare_containers() { service="${item[$j]}" recipe_install="$MIAOU_BASEDIR/recipes/$service/install.sh" if [[ -f "$recipe_install" ]]; then - echo "install [$service] onto container <$container>" + echo "install [$service] provided by container <$container>" "$recipe_install" "$container" else echoerr "FAILURE, for container <$container>, install recipe [$service] not found!" @@ -496,7 +496,7 @@ function build_services() { recipe="$MIAOU_BASEDIR/recipes/$app/crud.sh" if [[ -f "$recipe" ]]; then - echo "read [$app:$name] onto container <$container>" + echo "read [$app:$name] provided by container <$container>" command="env MIAOU_BASEDIR=$MIAOU_BASEDIR MIAOU_CONFIGDIR=$MIAOU_CONFIGDIR $recipe --port $port --container $container --name $name --fqdn $fqdn" [[ "$data" != "null" ]] && command+=" --data \"$data\"" if ! eval "$command -r" >/dev/null; then