Use public http url in setup scripts, bugfixes

Use public http url so script can be run w/o registering w the github

pkg/bootstrap-fedora-diaspora.sh

@@ -5,7 +5,7 @@
 #  Usage: pkg/bootstrap-fedora-diaspora.sh [external hostname]
 #
 #  Synopsis, install:
-#      $ git clone git@github.com:diaspora/diaspora.git
+#      $ git clone 'http://github.com/diaspora/diaspora.git'
 #      $ cd diaspora
 #      $ sudo pkg/bootstrap-fedora-diaspora.sh
 #
@@ -24,7 +24,7 @@
 #
 #  Must run as root
 
-GIT_REPO='git@github.com:leamas/diaspora.git'
+GIT_REPO=${GIT_REPO:-'http://github.com/diaspora/diaspora.git'}
 DIASPORA_HOSTNAME=${1:-'mumin.dnsalias.net'}
 
 test $UID = "0" || {
@@ -119,7 +119,10 @@ else
 fi
 
 echo "Starting server"
-script/server
+script/server -d
+pidfile="~diaspora/diaspora/log/diaspora-wsd.pid"
+echo " To stop server: pkill thin; kill $(cat $pidfile)"
+echo 'To restart server: sudo su - diaspora -c "diaspora/script/server -d"'
 
 EOF
 

pkg/fedora14-setup.bash

@@ -24,7 +24,7 @@
 #
 #  Must run as root
 
-GIT_REPO='git@github.com:leamas/diaspora.git'
+GIT_REPO='http://github.com/leamas/diaspora.git'
 DIASPORA_HOSTNAME=${1:-'mumin.dnsalias.net'}
 
 test $UID = "0" || {
@@ -44,7 +44,8 @@ yum install  -y git bison sqlite-devel  \
             ImageMagick libxslt-devel  libxml2-devel     \
             openssl-devel mongodb-server wget  \
             ruby-devel ruby-libs ruby-ri ruby-irb ruby-rdoc \
-            rubygem compat-readline5 git
+            rubygems compat-readline5 git
+sudo gem install bundler
 
 getent group diaspora  >/dev/null || groupadd diaspora
 getent passwd diaspora  >/dev/null || {
@@ -55,7 +56,7 @@ getent passwd diaspora  >/dev/null || {
 service mongod start
 
 su - diaspora << EOF
-#set -x
+#set -x #used by test scripts, keep
 
 [ -e  diaspora ] && {
     echo "Moving existing  diaspora out of the way"
@@ -66,7 +67,7 @@ git clone $GIT_REPO
 
 cd diaspora
 
-bundle install
+bundle install --deployment
 #bundle exec jasmine init
 
 #Configure diaspora
@@ -92,7 +93,10 @@ else
 fi
 
 echo "Starting server"
-script/server
+script/server -d
+pidfile="~diaspora/diaspora/log/diaspora-wsd.pid"
+echo " To stop server: pkill thin; kill $(cat $pidfile)"
+echo 'To restart server: sudo su - diaspora -c "diaspora/script/server -d"'
 
 EOF
 

pkg/ubuntu-setup.bash

@@ -11,6 +11,7 @@
 
 # USAGE: ./pkg/ubuntu-setup.bash  [external hostname]
 # Do NOT run this script as root.
+GIT_REPO=${GIT_REPO:-'http://github.com/diaspora/diaspora.git'}
 
 arg_hostname="$1"
 
@@ -139,7 +140,7 @@ echo "Installed bundler.."
     # Check if the user is already in a cloned source if not clone the source
     [[ $( basename $PWD ) == "diaspora" ]]  && \
         echo "Already in diaspora directory" ||  \
-        { git clone http://github.com/diaspora/diaspora.git && cd diaspora
+        { git $GIT_REPO && cd diaspora
               echo "Cloned the source.."
         }
 
@@ -195,5 +196,9 @@ echo "Installed bundler.."
 
     # Run appserver
     echo "Starting server"
-    script/server
+    script/server -d
+    pidfile="~diaspora/diaspora/log/diaspora-wsd.pid"
+    echo " To stop server: pkill thin; kill $(cat $pidfile)"
+    echo 'To restart server: sudo su - diaspora -c "diaspora/script/server -d"'
+
 )