minor improvements on machinectl

This commit is contained in:
boyska 2016-02-09 22:17:44 -05:00
parent ad69a764d8
commit bd241d19b0

View file

@ -67,11 +67,11 @@ EOF
cat <<EOF > /var/lib/machines/${intermediate}/etc/apt/sources.list.d/stretch.list cat <<EOF > /var/lib/machines/${intermediate}/etc/apt/sources.list.d/stretch.list
deb http://ftp.debian.org/debian stretch main deb http://ftp.debian.org/debian stretch main
EOF EOF
inm $intermediate apt-get update inm $intermediate /usr/bin/apt-get -q update
fi fi
# those are idempotent, so... # those are idempotent, so...
inm $intermediate /usr/bin/apt-get -y install apache2 libapache2-mod-php5 php5-gd mariadb-server git inm $intermediate /usr/bin/apt-get -q -y install apache2 libapache2-mod-php5 php5-gd php5-mysql mariadb-server git pwgen
inm $intermediate /usr/bin/apt-get -y install -t stretch composer inm $intermediate /usr/bin/apt-get -q -y install -t stretch composer
inm $intermediate /usr/sbin/a2enmod rewrite inm $intermediate /usr/sbin/a2enmod rewrite
inm $intermediate /usr/sbin/a2enmod php5 inm $intermediate /usr/sbin/a2enmod php5
inm $intermediate /bin/mkdir -p /mig inm $intermediate /bin/mkdir -p /mig
@ -96,5 +96,7 @@ testcreate() {
testcreate testcreate
progress "deploying on ${testmachine}" progress "deploying on ${testmachine}"
systemd-nspawn -D "/var/lib/machines/${testmachine}" --bind-ro="$(readlink -f $(dirname $0)/../):/mig" /mig/deploy/deploy.sh systemd-nspawn -D "/var/lib/machines/${testmachine}"\
ok "all done" --bind-ro="$(readlink -f $(dirname $0)/../):/mig" \
/mig/deploy/deploy.sh
ok "all done, enjoy!"