[GNUnet-SVN] r22943 - in gnunet-planetlab/gplmt: . contrib

[gnunet]

Author: wachs
Date: 2012-07-27 14:55:52 +0200 (Fri, 27 Jul 2012)
New Revision: 22943

Modified:
   gnunet-planetlab/gplmt/Nodes.py
   gnunet-planetlab/gplmt/TODO
   gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml
Log:
- changes


Modified: gnunet-planetlab/gplmt/Nodes.py
===================================================================
--- gnunet-planetlab/gplmt/Nodes.py     2012-07-27 12:41:39 UTC (rev 22942)
+++ gnunet-planetlab/gplmt/Nodes.py     2012-07-27 12:55:52 UTC (rev 22943)
@@ -69,7 +69,7 @@
             return False
         
         slice_data = {}
-        slice_data['name'] = 'tumple_gnunet'
+        slice_data['name'] = self.configuration.pl_slicename
 
         auth = {}
         auth['Username'] = self.configuration.pl_username

Modified: gnunet-planetlab/gplmt/TODO
===================================================================
--- gnunet-planetlab/gplmt/TODO 2012-07-27 12:41:39 UTC (rev 22942)
+++ gnunet-planetlab/gplmt/TODO 2012-07-27 12:55:52 UTC (rev 22943)
@@ -7,10 +7,12 @@
 - Parallel tasks
 - Monitor mode
 - Console mode
+- Implement curses based logger
 
 Known Bugs 
 ===============
 - SFTP does not work in PlanetLab nodes
+- Have to throttle parallelism due to "Too many open files" issue
 
 Implemented in
 ===============

Modified: gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml
===================================================================
--- gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml        2012-07-27 
12:41:39 UTC (rev 22942)
+++ gnunet-planetlab/gplmt/contrib/deploy_gnunet_fc8.xml        2012-07-27 
12:55:52 UTC (rev 22943)
@@ -11,7 +11,7 @@
         <stop_on_fail>true</stop_on_fail>
        </run> 
 
-       <sequence enabled="false">
+       <sequence  enabled="true">
        <!-- Install buildtools -->
        <run id="1" name="Install dependencies with yum : gcc">
           <command>sudo yum -y -t --nogpgcheck install</command> 
@@ -68,10 +68,10 @@
           <expected_return_code>0</expected_return_code>
           <expected_output></expected_output>
           <stop_on_fail>false</stop_on_fail>
-       </run>      
+       </run>  
     </sequence>
        
-       <sequence enabled="false">
+       <sequence  enabled="true">
        <!-- Install dependencies -->
     <run id="1" name="Install dependencies with yum : gnutls-devel">
           <command>sudo yum -y -t --nogpgcheck install</command> 
@@ -131,7 +131,7 @@
     </run>     
        </sequence>
 
-       <sequence enabled="false">
+       <sequence enabled="true">
         <!-- Setup subversion -->
     <run id="1" name="Install dependencies with yum : subversion">
           <command>sudo yum -y -t --nogpgcheck install</command> 
@@ -159,9 +159,9 @@
     </run>   
        </sequence>     
        
-       <sequence enabled="false">   
+       <sequence >   
        <!-- Install depencies from source -->
-       <sequence enabled="true">
+       <sequence  enabled="true">
        <!-- Install libtool -->
                <run id="1" name="Download libtool">
                <command>mkdir libtool; cd libtool; wget </command> 
@@ -231,7 +231,7 @@
             <stop_on_fail>true</stop_on_fail>
       </run>
     </sequence>
-     <sequence enabled="true">
+     <sequence  enabled="true">
      <!-- Install libgpg-error -->
       <run id="1" name="Download libgpg-error">
             <command>mkdir libgpg-error; cd libgpg-error; wget </command> 
@@ -266,7 +266,7 @@
             <stop_on_fail>true</stop_on_fail>
       </run>
     </sequence>      
-     <sequence enabled="true">
+     <sequence  enabled="true">
      <!-- Install libgcrypt -->
       <run id="1" name="Download libgcrypt">
             <command>mkdir libgcrypt; cd libgcrypt; wget </command> 
@@ -301,7 +301,7 @@
             <stop_on_fail>true</stop_on_fail>
       </run>
     </sequence>     
-         <sequence enabled="true">
+     <sequence  enabled="true">
      <!-- Install libcurl -->
       <run id="1" name="Download libcurl">
             <command>mkdir libcurl; cd libcurl; wget </command> 
@@ -370,14 +370,11 @@
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
       </run>
-    </sequence>     
     </sequence>
+    
 
-   
-
-     
-        <sequence enabled="false">
-     <!-- Install libextractor  -->
+        <sequence enabled="true">
+     <!-- Install libextractor -->
       <run id="1" name="Download libextractor">
             <command>mkdir libextractor; cd libextractor; wget </command> 
             
<arguments>ftp://ftp.gnu.org/gnu/libextractor/libextractor-0.6.3.tar.gz</arguments>
 
@@ -410,8 +407,126 @@
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
       </run>
-    </sequence>
-    <sequence enabled="false">
+    </sequence>  
+    
+       <sequence enabled="true">
+       <!-- Install libmicrohttpd and dependencies -->
+        <run id="1" name="Install dependencies with yum : gmp-devel">
+                       <!-- Install gmp and gmp devel for libnettle and gnutls 
-->
+               <command>sudo yum -y -t --nogpgcheck install</command> 
+               <arguments>gmp-devel</arguments> 
+               <timeout>0</timeout> 
+               <expected_return_code>0</expected_return_code>
+               <expected_output></expected_output>
+               <stop_on_fail>false</stop_on_fail>
+       </run>  
+    <sequence enabled="true">
+       <!-- Install libnettle required for GnuTLS-->
+       <run id="1" name="Download libnettle">
+            <command>mkdir libnettle; cd libnettle; wget </command> 
+            
<arguments>http://ftp.gnu.org/gnu/nettle/nettle-2.5.tar.gz</arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+       </run>
+       <run id="1" name="Unpack libnettle">
+            <command>cd libnettle; tar -xzvf</command> 
+            <arguments>nettle-2.5.tar.gz</arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+       </run>
+       <run id="1" name="Configure libnettle">
+            <command>cd libnettle/nettle-2.5; ./configure </command> 
+            <arguments></arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+       </run>
+       <run id="1" name="Install libnettle">
+            <command>cd libnettle/nettle-2.5; sudo make install</command>
+            <arguments> </arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+       </run>
+        </sequence>   
+     <!-- Install GnuTLS for MHD -->
+      <run id="1" name="Download GnuTLS">
+            <command>mkdir gnutls; cd gnutls; wget </command> 
+            
<arguments>http://ftp.gnu.org/gnu/gnutls/gnutls-2.12.20.tar.bz2</arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Unpack gnutls">
+            <command>cd gnutls; tar -xvjf</command> 
+            <arguments>gnutls-2.12.20.tar.bz2</arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Configure gnutls">
+            <command>cd gnutls/gnutls-2.12.20; ./configure</command> 
+            <arguments>--without-p11-kit</arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Install gnutls">
+            <command>cd gnutls/gnutls-2.12.20; sudo make install</command>
+            <arguments> </arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+    </sequence>   
+       <sequence >
+     <!-- Install libmicrohttpd  -->
+      <run id="1" name="Download ">
+            <command>mkdir libmicrohttpd; cd libmicrohttpd; wget </command> 
+            
<arguments>ftp://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.21.tar.gz</arguments>
 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Unpack libmicrohttpd">
+            <command>cd libmicrohttpd; tar -xzvf</command> 
+            <arguments>libmicrohttpd-0.9.21.tar.gz</arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Configure libmicrohttpd">
+            <command>cd libmicrohttpd/libmicrohttpd-0.9.21; ./configure 
</command> 
+            <arguments>--prefix=/usr/local </arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Install libmicrohttpd">
+            <command>cd libmicrohttpd/libmicrohttpd-0.9.21; sudo make 
install</command>
+            <arguments> </arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+    </sequence>    
+  </sequence>
+    
+    <sequence>
      <!-- Install GNUnet from svn -->
       <run id="1" name="Download GNUnet">
             <command>svn checkout</command> 
@@ -421,7 +536,7 @@
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
       </run>
-      <run id="1" name="Bootstrap GNUnet">
+      <run id="1" name="Bootstrap GNUnet" enabled="true">
             <command>cd gnunet; libtoolize; ./bootstrap</command> 
             <arguments></arguments> 
             <timeout>0</timeout> 
@@ -429,21 +544,48 @@
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
       </run>
-      <run id="1" name="Configure GNUnet">
+      <run id="1" name="Configure GNUnet" enabled="true">
             <command>cd gnunet; export LD_LIBRARY_PATH=/usr/local/lib; 
./configure </command> 
-            <arguments>--prefix=$HOME/gnbuild --with-extractor=/usr 
--with-libgcrypt=/usr/local --with-curl=/usr/local --with-mysql=/usr/lib/mysql 
--enable-logging=verbose</arguments> 
+            <arguments>--prefix=$HOME/gnbuild --with-extractor=/usr 
--with-libgcrypt-prefix=/usr/local --with-curl=/usr/local 
--with-mysql=/usr/lib/mysql --enable-logging=verbose</arguments> 
             <timeout>0</timeout> 
             <expected_return_code>0</expected_return_code>
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
       </run>
       <run id="1" name="Install GNUnet">
-            <command>cd gnunet; make install</command>
+            <command>cd gnunet; export LD_LIBRARY_PATH=/usr/local/lib; make 
install</command>
             <arguments> </arguments> 
             <timeout>0</timeout> 
             <expected_return_code>0</expected_return_code>
             <expected_output></expected_output>
             <stop_on_fail>true</stop_on_fail>
       </run>
+     <sequence enabled="true">
+     <!-- Postinstallation setup -->
+      <run id="1" name="Create GNUnet directory" enabled="true">
+            <command>mkdir .gnunet; touch .gnunet/gnunet.conf</command> 
+            <arguments></arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Set GNUNET_PREFIX" enabled="true">
+            <command>echo -e "export GNUNET_PREFIX=$HOME/gnbuild \n" >> 
~/.bashrc</command> 
+            <arguments></arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+      <run id="1" name="Configure GNUnet" enabled="true">
+            <command>echo -e "export PATH=$PATH:$GNUNET_PREFIX/bin \n" >> 
~/.bashrc</command> 
+            <arguments></arguments> 
+            <timeout>0</timeout> 
+            <expected_return_code>0</expected_return_code>
+            <expected_output></expected_output>
+            <stop_on_fail>true</stop_on_fail>
+      </run>
+    </sequence>            
     </sequence>        
 </tasklist>