Merge pull request #1261 from bburnichon/feature/install-fixes

Fixup installation process
This commit is contained in:
Nicolas Le Goff
2015-03-04 19:35:57 +01:00
5 changed files with 40 additions and 58 deletions

View File

@@ -1,4 +0,0 @@
{
"directory": "www/assets",
"interactive": false
}

View File

@@ -145,16 +145,12 @@ then
#copy configuration template
mv /var/www/phraseanet/lib/conf.d/configuration.yml /var/www/phraseanet/lib/conf.d/configuration.yml.bkp
cp /vagrant/resources/vagrant/config/phraseanet/configuration.yml /var/www/phraseanet/lib/conf.d/configuration.yml
mv /var/www/phraseanet/.bowerrc /var/www/phraseanet/.bowerrc.bkp
cp /vagrant/resources/vagrant/config/bower/.bowerrc /var/www/phraseanet/.bowerrc
cd /var/www/phraseanet
sudo -u vagrant composer install -n --prefer-source --dev
sudo -u vagrant npm install
sudo -u vagrant grunt install-assets
sudo -u vagrant bin/developer assets:compile-less
sudo -u vagrant rm -f /var/www/phraseanet/lib/conf.d/configuration.yml
rm -f /var/www/phraseanet/.bowerrc
mv /www/phraseanet/.bowerrc.bkp /www/phraseanet/.bowerrc
mv /var/www/phraseanet/lib/conf.d/configuration.yml.bkp /var/www/phraseanet/lib/conf.d/configuration.yml
fi
@@ -167,5 +163,4 @@ sudo service nginx restart
sudo service iptables-persistent stop
# reload bash
source ~/.bashrc
source ~/.bashrc