From 67551f2876553d011ff213b05949dc9e543aaa0e Mon Sep 17 00:00:00 2001 From: j Date: Thu, 16 Mar 2017 23:08:08 +0100 Subject: [PATCH] use 16.04 --- README.md | 2 ++ Vagrantfile | 4 ++-- install.sh | 6 +++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b928cf4..13f30a1 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ Pan.do/ra Vagrant 1. Install Vagrant (https://www.vagrantup.com/) 2. Checkout this repository 3. Setup Vagrant + $ vagrant up && vagrant halt +3. Start Vagrant pan.do/ra $ vagrant up 4. Open Browser at http://localhost:2620/ 5. SSH into VM diff --git a/Vagrantfile b/Vagrantfile index b59ae22..65abaf4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -8,8 +8,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.hostname = 'pandora' config.vm.guest = :ubuntu config.package.name = 'pandora.box' - config.vm.box = 'trusty-cloud' - config.vm.box_url = 'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box' + config.vm.box = "ubuntu/xenial64" + config.vm.box_url = "https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-vagrant.box" config.vm.network "forwarded_port", guest: 80, host: 2620 config.vm.synced_folder ".", "/srv" config.vm.provision "shell", path: "install.sh" diff --git a/install.sh b/install.sh index e3bfd9e..2dcebdc 100755 --- a/install.sh +++ b/install.sh @@ -2,13 +2,17 @@ if [ -x /srv/pandora ]; then sudo -H -u vagrant /srv/pandora/update.py dev else + apt-get update -qq apt-get install -y curl >/dev/null 2>&1 + locale-gen en_US.UTF-8 + export LANG=en_US.UTF-8 + echo LANG=en_US.UTF-8 >> /etc/locale.conf curl -sL https://pan.do/ra-install > /srv/pandora_install.sh chmod +x /srv/pandora_install.sh echo "Installing pan.do/ra..." echo "logging installation progress into pandora_install.log" - export PANDORA=vagrant + export PANDORA=ubuntu /srv/pandora_install.sh >/srv/pandora_install.log 2>&1 rm /srv/pandora_install.sh fi