diff --git a/util/debian-install/Vagrantfile b/util/debian-install/Vagrantfile index d1cfe09..63fe261 100644 --- a/util/debian-install/Vagrantfile +++ b/util/debian-install/Vagrantfile @@ -13,9 +13,11 @@ else local_debs = Dir.glob('*.deb') debs.each do |f| fn = File.basename(f) - if local_debs.include?(fn) - local_debs.delete(fn) - else + + local_debs.delete(fn) + + if File.stat(f) != File.stat(fn) + FileUtils::Verbose.rm_f(fn) FileUtils::Verbose.ln f, '.' end end diff --git a/util/debian-install/install b/util/debian-install/install index 999bbfb..6ec2cf3 100755 --- a/util/debian-install/install +++ b/util/debian-install/install @@ -61,19 +61,35 @@ deb http://download.noosfero.org/debian/wheezy-test ./ deb-src http://download.noosfero.org/debian/wheezy-test ./ EOF +sed -e 's/wheezy/&-backports/' \ + /etc/apt/sources.list > /etc/apt/sources.list.d/backports.list + export DEBIAN_FRONTEND=noninteractive +# local debs +if [ -n "$(find /vagrant -name '*.deb')" ]; then + apt-get install -qy apt-utils bzip2 + ( + rm -rf /opt/noosfero + mkdir /opt/noosfero + cp /vagrant/*.deb /opt/noosfero + cd /opt/noosfero + apt-ftparchive packages . > Packages + cat Packages | gzip - > Packages.gz + cat Packages | bzip2 - > Packages.bz2 + apt-ftparchive release . > Release + echo 'deb [trusted=yes] file:///opt/noosfero ./' > /etc/apt/sources.list.d/local.list + ) +else + rm -f /etc/apt/sources.list.d/local.list +fi + apt-get update apt-get dist-upgrade -qy -apt-get install -qy postgresql ruby1.8 +apt-get install -qy postgresql -if dpkg --unpack /vagrant/noosfero_*.deb /vagrant/noosfero-apache_*.deb; then - apt-cache policy noosfero - apt-get install -qyf -else - apt-cache policy noosfero - apt-get install -qy noosfero noosfero-apache -fi +apt-cache policy noosfero +apt-get install -qy noosfero noosfero-apache a2dissite 000-default service apache2 reload -- libgit2 0.21.2