X-Git-Url: http://git.pjr.cc/?p=ga4php.git;a=blobdiff_plain;f=contrib%2Fsetupserver.sh;fp=contrib%2Fsetupserver.sh;h=8d233bfc1441c66f23a4273fbf77c20c1683772d;hp=c5859818724227d4e106ce38b2481c57973396c3;hb=fbe9740a0e8f0ee450cf2657fca374799e715c7d;hpb=4104b257d1998fe7cac9c651975e6e3cb8948705

diff --git a/contrib/setupserver.sh b/contrib/setupserver.sh
index c585981..8d233bf 100755
--- a/contrib/setupserver.sh
+++ b/contrib/setupserver.sh
@@ -52,7 +52,7 @@ fi
 
 # first install apt packages for apache and php
 echo "Beginning install of apt-get packages"
-apt-get install -y apache2 libapache2-mod-php5 php-soap php5-ldap php5-cli php5-adodb subversion > /dev/null 2>&1
+apt-get install -y apache2 libapache2-mod-php5 php-soap php5-ldap php5-cli php5-adodb subversion qrencode > /dev/null 2>&1
 
 if [ "$?" != "0" ]
 then
@@ -66,19 +66,24 @@ echo "Apt-get packages installed, getting auth server code"
 MYTMPDIR="/tmp/ga$RANDOM"
 mkdir -p $MYTMPDIR
 cd $MYTMPDIR
-svn checkout http://ga4php.googlecode.com/svn/trunk/authserver authserver > /dev/null 2>&1
+svn checkout http://ga4php.googlecode.com/svn/trunk/ ga4php > /dev/null 2>&1
 if [ "$?" != "0" ]
 then
 	echo "There was a problem downloading the authserver source code.. bailing"
 	exit 2
 fi
 
-svn checkout http://ga4php.googlecode.com/svn/trunk/contrib contrib > /dev/null 2>&1
-if [ "$?" != "0" ]
-then
-	echo "There was a problem downloading the contrib source code.. bailing"
-	exit 2
-fi
+echo "Code downloaded, beginning installation into /opt/gaas"
+
+mkdir /opt/gaas
+cp -r * /opt/gaas
+
+echo "Createing service user"
+useradd -d /opt/gaas -r gaas -m
 
-echo "Code downloaded, beginning installation"
+chown -R gaas:gaas /opt/gaas
+echo "Tightening up permissions"
+chmod 700 /opt/gaas/authserver/authd
+chmod 770 /opt/gaas/authserver/
 
+echo "Users who wish to use the gaas system must now be added to the gaas group"