Switch to unified view

a/vagrant/start_allura b/vagrant/start_allura
...
...
17
then
17
then
18
    echo "Solr is running."
18
    echo "Solr is running."
19
else
19
else
20
    echo "Starting Solr..."
20
    echo "Starting Solr..."
21
    cd /home/vagrant/src/apache-solr-1.4.1/example
21
    cd /home/vagrant/src/apache-solr-1.4.1/example
22
    nohup java -Dsolr.solr.home=/home/vagrant/src/forge/solr_config -jar start.jar >/var/log/allura/solr.log 2>&1 &
22
    nohup java -Dsolr.solr.home=/home/vagrant/src/allura/solr_config -jar start.jar >/var/log/allura/solr.log 2>&1 &
23
fi
23
fi
24
24
25
cd /home/vagrant/src/forge/Allura
25
cd /home/vagrant/src/allura/Allura
26
26
27
# Start taskd
27
# Start taskd
28
if pgrep -f "paster taskd" >/dev/null
28
if pgrep -f "paster taskd" >/dev/null
29
then
29
then
30
    echo "Taskd is running."
30
    echo "Taskd is running."
...
...
35
35
36
# Run setup-app
36
# Run setup-app
37
if [ ! -f /var/lib/mongodb/allura.0 ]
37
if [ ! -f /var/lib/mongodb/allura.0 ]
38
then
38
then
39
    echo "Initializing database..."
39
    echo "Initializing database..."
40
    paster setup-app development.ini >/var/log/allura/setup-app.log 2>&1
40
    paster setup-app development.ini >/var/log/allura/setup-app.log 2>&1 || echo "Error, see /var/log/allura/setup-app.log"
41
fi
41
fi
42
42
43
# Start the web server
43
# Start the web server
44
if pgrep -f "paster serve" >/dev/null
44
if pgrep -f "paster serve" >/dev/null
45
then
45
then