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

[gnunet]

Author: wachs
Date: 2013-01-14 13:08:20 +0100 (Mon, 14 Jan 2013)
New Revision: 25772

Modified:
   gnunet-planetlab/gplmt/contrib/gnunet.conf
   gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml
Log:
changes


Modified: gnunet-planetlab/gplmt/contrib/gnunet.conf
===================================================================
--- gnunet-planetlab/gplmt/contrib/gnunet.conf  2013-01-14 12:02:40 UTC (rev 
25771)
+++ gnunet-planetlab/gplmt/contrib/gnunet.conf  2013-01-14 12:08:20 UTC (rev 
25772)
@@ -1,44 +1,12 @@
-[gplmt]
-#nodes = contrib/localhost.nodes
-nodes = contrib/current.nodes
+[fs]
+# Maximum number of requests this peer tracks (important for
+# memory consumption; 2k RAM/request is not unusual)
+MAX_PENDING_REQUESTS = 1024
 
-#tasks = contrib/tasks.xml
-#tasks = contrib/deploy_gnunet.xml
-tasks = contrib/deploy_gnunet_fc12.xml
-#tasks = contrib/sftp_tasks.xml
+[transport]
+PLUGINS = udp tcp http_client http_server https_client https_server
 
-# Which notification mechanism to use: 
-# simple: print messages to stdout
-notification = simple
-
-[planetlab]
-slice = tumple_gnunet_deployment
-
-# Configuration for Planetlab API
-# Use PlanetLab nodes instead of nodes file
-use_pl_nodes = no
-# PlanetLab Europe
-api_url = https://www.planet-lab.eu/PLCAPI/
-# Planetlab
-#api_url = https://www.planet-lab.org/PLCAPI/
-
-# Planetlab username
-username = <pl username>
-# Planetlab password
-password = <password>
-
-[ssh]
-# Order of ssh authentication:
-#
-# The ssh_keyfile_filename passed in (if any)
-# Any key we can find through an SSH agent
-# Any "id_rsa" or "id_dsa" key discoverable in ~/.ssh/
-# Plain password auth, if a ssh_password was given
-
-#ssh_keyfile = <keyfile>
-ssh_password = <password>
-
-# Use system's SSH "known hosts" file
-ssh_use_known_hosts = yes
-# Add node hostkeys automatically
-add_unkown_hostkeys = yes
\ No newline at end of file
+[statistics]
+PORT = 2088
+ACCEPT_FROM = 127.0.0.1;131.159.20.52;
+ACCEPT_FROM6 = ::1;2001:4ca0:2001:11:226:b9ff:fe7d:84ed;

Modified: gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml
===================================================================
--- gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml     
2013-01-14 12:02:40 UTC (rev 25771)
+++ gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml     
2013-01-14 12:08:20 UTC (rev 25772)
@@ -7,7 +7,7 @@
         <arguments></arguments> 
         <timeout>10</timeout>
         <expected_return_code>0</expected_return_code>
-        <expected_output>2012</expected_output>
+        <expected_output>2013</expected_output>
         <stop_on_fail>true</stop_on_fail>
        </run>
      <run id="0" name="remove old config">