fix conflict

pull/3/head
Cédric Bonhomme 2018-01-25 08:53:41 +01:00
commit 59d8b5e9bd
No known key found for this signature in database
GPG Key ID: A1CB94DE57B7A70D
2 changed files with 5 additions and 3 deletions

View File

@ -20,8 +20,8 @@
"disk_size": "{{user `disk_size`}}",
"iso_url": "http://releases.ubuntu.com/17.10/ubuntu-17.10-server-amd64.iso",
"iso_checksum": "af913c00296eb0cfece99b8a02ae6db035ae173ed240241e780c8d7db96914b1",
"iso_url": "http://releases.ubuntu.com/17.10/ubuntu-17.10.1-server-amd64.iso",
"iso_checksum": "8ff73f1b622276758475c3bd5190b382774626de5a82c50930519381f6c3a3f8",
"iso_checksum_type": "sha256",
"http_directory" : "preseeds",

View File

@ -116,7 +116,9 @@ sudo apt-get install -y postfix > /dev/null 2>&1
echo "--- Installing MariaDB specific packages and settings ---"
sudo apt-get install -y mariadb-client mariadb-server > /dev/null 2>&1
# Secure the MariaDB installation (especially by setting a strong root password)
sleep 7 # give some time to the DB to launch…
sleep 10 # give some time to the DB to launch...
sudo systemctl restart mariadb.service
sleep 10
sudo apt-get install -y expect > /dev/null 2>&1
## do we need to spawn mysql_secure_install with sudo in future?
expect -f - <<-EOF