X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=README;h=7fa6f6ee35f54179408993ecb26208dea31da5bd;hp=2ce466989b15cb55cb4bbece7115e9e1a6d16cc6;hb=refs%2Fheads%2Fonelab;hpb=ed078cce90a313ddd6e5b41ecff6c14344a99220

diff --git a/README b/README
index 2ce46698..7fa6f6ee 100644
--- a/README
+++ b/README
@@ -1,42 +1,63 @@
-This file documents the contents of this module
-change
-Last update 4 sept. 2013
+Last update 21 MAY. 2015
 
-See the devel/ subdir for more devel-oriented doc.
+Installation
+=================================================================
+Complete Guide: http://trac.myslice.info/wiki/Manifold/Install
 
-==================== 1 minute howto
+Recommended OS
+===============
+Debian GNU/Linux 7.5 (wheezy) x64
 
-*  REQUIREMENTS  is to have python + django (1.5.2) installed django
-** should be straightforward
-** see devel/django-install.txt in case of trouble
-$ apt-get install python-django
-$ apt-get install python-django-south
-
-* git clone git://git.onelab.eu/myslice.git
--- or --
-* git clone ssh://yourlogin@git.onelab.eu/git/myslice.git
-
-* edit/create myslice/myslice.ini and enter the details of your manifold backend
+PYTHON DEPENDENCIES
+=====================
+sudo apt-get install python-pip or sudo easy_install pip==1.4.1
+sudo apt-get install python-dev (for paramiko and pyOpenSSL)
+sudo apt-get install libffi-dev (for pyOpenSSL)
 
+$ pip install django=="1.5.2"
 $ apt-get install python-django-south
-* init django
-** when django prompts for creating an admin account, create it and 
-** keep the username and password safe
+$ pip install requests
+$ pip install djangorestframework
+$ pip install django-celery
+$ pip install geopy
+$ pip install paramiko
+$ pip install pyparsing
+$ pip install python-dateutil
+$ pip instal pyOpenSSL
+$ pip install xmltodict
+
+MYSLICE
+=======
+git clone ssh://yourlogin@git.onelab.eu/git/myslice.git
+cd myslice
+git checkout onelab
+
+edit/create myslice/myslice.ini and enter the details of your manifold backend
+
 $ ./manage.py syncdb
 $ ./manage.py migrate
+$ ./manage.py collectstatic
+
+Run the development server
+$ ./devel/server-loop.sh
+
+MANIFOLD
+==========
+git clone git://git.onelab.eu/manifold.git
+cd manifold
+git checkout devel
+make && make install
 
-* gather static files
-$ ./manage.py collectstatic 
--- or --
-$ ./manage.py collectstatic --noinput
--- or --
-$ make static (which is a shorthand for cleaning up and run manage collectstatic --noinput)
+SFA
+===
+$ git clone -b geni-v3 git://git.onelab.eu/sfa.git
+$ cd sfa 
+$ git checkout geni-v3
 
-* gather templates files 
-  for now we still seem to rely on a make-based templates-collection process
-  that creates templates/ 
-$ make templates [$ make redo (each time when you pull, do that and restart the server)]
+$ make version
+$ python ./setup.py install
 
+=====================================================================
 
 ## Whenever doing a git pull the following operations are recommended:
 
@@ -246,19 +267,11 @@ $python manage.py migrate
 
 As south is already installed , you just have to do:
 
-$./manage.py migrate
-
-if it fails:
-
-1. go to myslice directory
-2. do sqlite3 myslice.sqlite3 [if sqlite3: command not found, do $apt-get install sqlite3]
-3. check the list of tables with sqlite> .tables
-4. if you find those tables that was mentioned in the failure message while running $./manage.py migrate
-	do sqlite> DROP TABLE mentioned_table 
-	[mentioned_table = the tables that was explicity mentioned in the failure message of $./manage.py migrate]
-5. sqlite> .quit
-6. $./manage.py migrate  
-
-
-
-
+# ./manage.py schemamigration portal --initial
+# sqlite3 /var/unfold/unfold.sqlite3
+	sqlite> DROP TABLE "portal_institution";
+	sqlite> DROP TABLE "portal_pendinguser";
+	sqlite> DROP TABLE "portal_pendingauthority";
+	sqlite> DROP TABLE "portal_pendingslice";
+	sqlite> .quit
+# ./manage.py migrate portal