miaou/miaou-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

provided by

Browse Source
This commit is contained in:
pvincent
2024-10-09 09:02:10 +04:00
parent bf90cbb28e
commit 5ac2e4842d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/functions.sh
+1 -1
View File
@@ -384,7 +384,7 @@ function join() {
builtin echo "$*" builtin echo "$*"
} }
# execute remote scripting onto one LXC container <CONTAINER> [COMMANDS, ...] # execute remote scripting over one LXC container <CONTAINER> [COMMANDS, ...]
# may use one command like: `lxc_exec ct1 uname -a` # may use one command like: `lxc_exec ct1 uname -a`
# or pipe like so: ` # or pipe like so: `
# cat <<EOF | lxc_exec ct1 # cat <<EOF | lxc_exec ct1
recipes/dolibarr/crud.sh
+1 -1
View File
@@ -62,7 +62,7 @@ EOF
PHP_VERSION=$(lxc exec "$container" -- dpkg -l php-fpm | grep "^ii" | cut -d ':' -f2 | cut -d '+' -f1) PHP_VERSION=$(lxc exec "$container" -- dpkg -l php-fpm | grep "^ii" | cut -d ':' -f2 | cut -d '+' -f1)
APP_PORT=$port APP_NAME=$longname PHP_VERSION=$PHP_VERSION tera -e -t "$MIAOU_BASEDIR/templates/apps/dolibarr/host.j2" -o "$MIAOU_CONFIGDIR/apps/dolibarr/$shortname/host.conf" "$MIAOU_CONFIGDIR/miaou.expanded.yaml" >/dev/null APP_PORT=$port APP_NAME=$longname PHP_VERSION=$PHP_VERSION tera -e -t "$MIAOU_BASEDIR/templates/apps/dolibarr/host.j2" -o "$MIAOU_CONFIGDIR/apps/dolibarr/$shortname/host.conf" "$MIAOU_CONFIGDIR/miaou.expanded.yaml" >/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" 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" echo "copying files over container <$container> ... OK"
recipes/mariadb/install.sh
+1 -1
View File
@@ -34,7 +34,7 @@ function install() {
echowarn "initializing ..." echowarn "initializing ..."
launch_container "$CONTAINER" launch_container "$CONTAINER"
build_device_backup 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 <<EOF lxc exec "$CONTAINER" -- bash <<EOF
set -Eeuo pipefail set -Eeuo pipefail
cloud-init status --wait >/dev/null cloud-init status --wait >/dev/null
scripts/miaou
+2 -2
View File
@@ -466,7 +466,7 @@ function prepare_containers() {
service="${item[$j]}" service="${item[$j]}"
recipe_install="$MIAOU_BASEDIR/recipes/$service/install.sh" recipe_install="$MIAOU_BASEDIR/recipes/$service/install.sh"
if [[ -f "$recipe_install" ]]; then if [[ -f "$recipe_install" ]]; then
echo "install [$service] onto container <$container>" echo "install [$service] provided by container <$container>"
"$recipe_install" "$container" "$recipe_install" "$container"
else else
echoerr "FAILURE, for container <$container>, install recipe [$service] not found!" echoerr "FAILURE, for container <$container>, install recipe [$service] not found!"
@@ -496,7 +496,7 @@ function build_services() {
recipe="$MIAOU_BASEDIR/recipes/$app/crud.sh" recipe="$MIAOU_BASEDIR/recipes/$app/crud.sh"
if [[ -f "$recipe" ]]; then 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" command="env MIAOU_BASEDIR=$MIAOU_BASEDIR MIAOU_CONFIGDIR=$MIAOU_CONFIGDIR $recipe --port $port --container $container --name $name --fqdn $fqdn"
[[ "$data" != "null" ]] && command+=" --data \"$data\"" [[ "$data" != "null" ]] && command+=" --data \"$data\""
if ! eval "$command -r" >/dev/null; then if ! eval "$command -r" >/dev/null; then