From 499c3cba6c21745dfb4515636080a4a6550faeae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Thu, 25 Jan 2018 22:57:11 +0100 Subject: [PATCH] Prepare for the next Ubuntu LTS release. --- vagrant/Vagrantfile | 5 ++--- vagrant/bootstrap.sh | 30 ++++++++++++++++-------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 1848093..7714eb5 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -11,8 +11,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Every Vagrant virtual environment requires a box to build off of. #config.vm.box = "bento/ubuntu-16.04" - config.vm.box = "ubuntu/zesty64" - #config.vm.box_url = "https://atlas.hashicorp.com/ubuntu/boxes/zesty64/versions/20170412.1.0" + config.vm.box = "ubuntu/artful64" config.vm.provision :shell, path: "bootstrap.sh", args: "#{ENV['GITHUB_AUTH_TOKEN']}" # Disable automatic box update checking. If you disable this, then @@ -55,7 +54,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # # # Use VBoxManage to customize the VM. For example to change memory: vb.customize ["modifyvm", :id, "--memory", "1024"] - vb.customize ["modifyvm", :id, "--name", "MONARC FO - Ubuntu 17.04 - DEV"] + vb.customize ["modifyvm", :id, "--name", "MONARC FO - Ubuntu 17.10 - DEV"] end # # View the documentation for the provider you're using for more diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index 9d6fbb1..4f6d394 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -26,24 +26,26 @@ post_max_size=50M max_execution_time=100 max_input_time=223 memory_limit=512M -PHP_INI=/etc/php/7.0/apache2/php.ini +PHP_INI=/etc/php/7.1/apache2/php.ini echo -e "\n--- Installing MONARC FO... ---\n" echo -e "\n--- Updating packages list ---\n" -apt-get -qq update +apt-get update echo -e "\n--- Install base packages ---\n" -apt-get -y install vim zip unzip git gettext > /dev/null 2>&1 +apt-get -y install vim zip unzip git gettext > /dev/null -echo -e "\n--- Install MariaDB (a MySQL fork/alternative) specific packages and settings ---\n" +echo -e "\n--- Install MariaDB specific packages and settings ---\n" echo "mysql-server mysql-server/root_password password $DBPASSWORD_ADMIN" | debconf-set-selections echo "mysql-server mysql-server/root_password_again password $DBPASSWORD_ADMIN" | debconf-set-selections -apt-get -y install mariadb-server mariadb-client > /dev/null 2>&1 +apt-get -y install mariadb-server mariadb-client > /dev/null +systemctl restart mariadb.service +sleep 5 echo -e "\n--- Installing PHP-specific packages ---\n" -apt-get -y install php apache2 libapache2-mod-php php-curl php-gd php-mcrypt php-mysql php-pear php-apcu php-xml php-mbstring php-intl php-imagick php-zip > /dev/null 2>&1 +apt-get -y install php apache2 libapache2-mod-php php-curl php-gd php-mcrypt php-mysql php-pear php-apcu php-xml php-mbstring php-intl php-imagick php-zip > /dev/null echo -e "\n--- Configuring PHP ---\n" for key in upload_max_filesize post_max_size max_execution_time max_input_time memory_limit @@ -62,7 +64,7 @@ sudo sed -i "s/AllowOverride None/AllowOverride All/g" /etc/apache2/apache2.conf #sed -i "s/error_reporting = .*/error_reporting = E_ALL/" /etc/php/7.0/apache2/php.ini #sed -i "s/display_errors = .*/display_errors = On/" /etc/php/7.0/apache2/php.ini -echo -e "\n--- Setting up our MySQL user for MONARC ---\n" +echo -e "\n--- Setting up our MariaDB user for MONARC ---\n" mysql -u root -p$DBPASSWORD_ADMIN -e "CREATE USER '$DBUSER_MONARC'@'localhost' IDENTIFIED BY '$DBPASSWORD_MONARC';" mysql -u root -p$DBPASSWORD_ADMIN -e "GRANT ALL PRIVILEGES ON * . * TO '$DBUSER_MONARC'@'localhost';" mysql -u root -p$DBPASSWORD_ADMIN -e "FLUSH PRIVILEGES;" @@ -212,17 +214,17 @@ EOF echo -e "\n--- Creation of the data bases---\n" -mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC -e "CREATE DATABASE monarc_cli DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;" > /dev/null 2>&1 -mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC -e "CREATE DATABASE monarc_common DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;" > /dev/null 2>&1 +mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC -e "CREATE DATABASE monarc_cli DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;" > /dev/null +mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC -e "CREATE DATABASE monarc_common DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;" > /dev/null echo -e "\n--- Populating MONARC DB ---\n" -mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC monarc_common < db-bootstrap/monarc_structure.sql > /dev/null 2>&1 +mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC monarc_common < db-bootstrap/monarc_structure.sql > /dev/null mysql -u $DBUSER_MONARC -p$DBPASSWORD_MONARC monarc_common < db-bootstrap/monarc_data.sql > /dev/null 2>&1 echo -e "\n--- Installation of Grunt ---\n" -apt-get -y install nodejs > /dev/null 2>&1 -apt-get -y install npm > /dev/null 2>&1 -npm install -g grunt-cli > /dev/null 2>&1 +apt-get -y install nodejs > /dev/null +apt-get -y install npm > /dev/null +npm install -g grunt-cli > /dev/null ln -s /usr/bin/nodejs /usr/bin/node @@ -235,7 +237,7 @@ php ./vendor/robmorgan/phinx/bin/phinx seed:run -c ./module/MonarcFO/migrations/ echo -e "\n--- Restarting Apache ---\n" -service apache2 restart > /dev/null 2>&1 +systemctl restart apache2.service > /dev/null echo -e "\n--- MONARC is ready! Point your Web browser to http://127.0.0.1:5001 ---\n"