From f88882ce1ac7c0c3b8e6c454b84c0df4f239ff53 Mon Sep 17 00:00:00 2001 From: Daniel Karlsson Date: Tue, 10 Feb 2015 16:13:23 +0100 Subject: [PATCH] [#991] Changed . for : in chown call Since some BSDs allow . (dot) in the username & we can just as well use the more common : between group and user. --- .gitignore | 5 ++++- data/README.md | 0 vagrant/provisioning/load_test_db.sh | 3 +-- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 data/README.md diff --git a/.gitignore b/.gitignore index 499995066c..caf7dedf66 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,10 @@ akvo/settings/6*.conf akvo/settings/backup akvo/testing.py scripts/dev-vm/ -data/dump +data/* +!data/README.md +!data/dump.sh +!data/load.sh # Dev environment .vagrant diff --git a/data/README.md b/data/README.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vagrant/provisioning/load_test_db.sh b/vagrant/provisioning/load_test_db.sh index 800b1359b8..dc02babb60 100644 --- a/vagrant/provisioning/load_test_db.sh +++ b/vagrant/provisioning/load_test_db.sh @@ -26,7 +26,7 @@ unzip $WORKDIR/rsr-test-db.zip -d $WORKDIR rm -rfv /var/akvo/rsr/mediaroot/db cp -rv $WORKDIR/rsr-test-db/media/db /var/akvo/rsr/mediaroot/db -chown -R rsr.rsr /var/akvo/rsr/mediaroot/db +chown -R rsr:rsr /var/akvo/rsr/mediaroot/db zcat $WORKDIR/rsr-test-db/rsr.sql.gz | sudo -H -u postgres psql rsr @@ -36,4 +36,3 @@ $manage migrate $manage collectstatic --noinput echo `date` > /etc/localdev_rsr_provisioned -