diff --git a/Makefile b/Makefile index 70ae514..15103f4 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,8 @@ deb: clean init @fpm -s dir -t deb -n ${NAME} -v ${VERSION} \ --pre-install=packaging/scripts/pre_install.sh \ --post-install=packaging/scripts/post_install.sh \ - --depends 'postgresql >= 9.2' \ - --depends 'postgresql-contrib >= 9.2' \ + --depends 'postgresql >= 9.3' \ + --depends 'postgresql-contrib >= 9.3' \ --depends 'libpq-dev' \ --deb-pre-depends pwgen \ --deb-pre-depends python2.7 \ diff --git a/Vagrantfile b/Vagrantfile index 67bf933..9a9b435 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -9,6 +9,7 @@ Vagrant.configure("2") do |config| # Every Vagrant virtual environment requires a box to build off of. config.vm.box = "precise64" config.vm.provision :shell, :path=>"./vagrant/bootstrap.sh" + # The url from where the 'config.vm.box' box will be fetched if it # doesn't already exist on the user's system. diff --git a/bin/bill.py b/bin/bill.py index c561b1f..53ee1f6 100644 --- a/bin/bill.py +++ b/bin/bill.py @@ -41,7 +41,7 @@ if __name__ == '__main__': parser.add_argument( "--from", dest="start", - help="When to start our range, date format %s", + help="When to start our range, date format %s" % ( date_fmt.replace("%","%%") ) , type=date_fmt_fnc, default=datetime.datetime.now() - datetime.timedelta(days=31) ) diff --git a/bin/usage.py b/bin/usage.py index aae704a..dd79676 100644 --- a/bin/usage.py +++ b/bin/usage.py @@ -48,9 +48,9 @@ if __name__ == '__main__': parser.add_argument( "--from", dest="start", - help="When to start our range, date format %s", + help="When to start our range, date format %s" % ( date_fmt.replace("%","%%") ), type=date_fmt_fnc, - default=datetime.datetime.now() - datetime.timedelta(days=31) + default= datetime.datetime.now() - datetime.timedelta(days=31) ) parser.add_argument( "--to", dest="end", diff --git a/packaging/scripts/post_install.sh b/packaging/scripts/post_install.sh index 1acde37..d93248b 100644 --- a/packaging/scripts/post_install.sh +++ b/packaging/scripts/post_install.sh @@ -35,5 +35,5 @@ chmod 0755 /usr/local/bin/artifice-bill cp <%=install_path%>/etc/artifice/conf.yaml /etc/artifice/conf.yaml cp <%=install_path%>/etc/artifice/database /etc/artifice/database -# chown 0640 /etc/artifice/database + chown 0644 /etc/artifice/database diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index 3a36e71..7d66b63 100644 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -1,12 +1,90 @@ -cp /vagrant/sources.list /etc/apt/sources.list +apt-get -y install language-pack-en aptitude + + +cat > /etc/apt/sources.list < /tmp/puppet.deb +sudo dpkg -i /tmp/puppet.deb -aptitude install gdebi-core +sudo apt-get update -gdebi -n /vagrant/openstack-artifice_0.1_amd64.deb \ No newline at end of file +apt-get install catalyst-keyring +apt-get -y update + +sudo apt-get -y upgrade + +apt-get -q -y -o DPkg::Options::=--force-confold install puppet gdebi +apt-get -y install language-pack-en # just to confirm