Sync server side to 0.2-8

vertigo0001 · Jul 18, 2013 · 81651fc · 81651fc
1 parent d238cc5
commit 81651fc
Show file tree

Hide file tree

Showing 206 changed files with 14,615 additions and 8,163 deletions.
diff --git a/config/debian/dpkg_server/grr-server.cron.d b/config/debian/dpkg_server/grr-server.cron.d
diff --git a/config/grr_test.conf b/config/grr_test.conf
@@ -8,6 +8,21 @@ security_manager = BasicAccessControlManager
 
 [MongoDataStore]
 __doc__ = Mongo settings
+Datastore.implementation = MongoDataStore
+
+[Mongo]
+# server =
+# port = 27017
+# db_name = grr
+
+[MySQLDataStore]
+Datastore.implementation = MySQLDataStore
+
+[Mysql]
+# database_name =
+# table_name =
+# database_username =
+# database_password =
 
 [AdminUI]
 __doc__ = These settings will be executed in the admin ui component.
@@ -17,7 +32,7 @@ django_debug = True
 port = 8000
 bind = ::
 django_secret_key = CHANGE_ME
-Logging.filename = grr-ui.log
+Logging.filename = %(Logging.path)/grr-ui.log
 
 [Worker]
 Logging.filename = %(Logging.path)/grr-worker.log
@@ -40,7 +55,7 @@ Client.rss_max = 4000
 Datastore.implementation = FakeDataStore
 Client.location = http://%(Frontend.bind_address):%(Frontend.bind_port)/control
 Client.poll_max = 5
-Logging.filename = grr-demo.log
+Logging.filename = %(Logging.path)/grr-demo.log
 
 
 [LocalTest]

diff --git a/cron/__init__.py b/cron/__init__.py
diff --git a/cron/cron.py b/cron/cron.py
diff --git a/docs/admin.html b/docs/admin.html
@@ -1201,13 +1201,9 @@ <h3 id="_running_the_grr_http_server_in_apache">Running the GRR HTTP Server In A
 <div class="sect1">
 <h2 id="_scheduling_flows_with_cron">Scheduling Flows with Cron</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>The cron allows for scheduling actions to run regularly on the GRR server.
-This is currently used to collect statistics and do cleanup on the database.</p></div>
-<div class="paragraph"><p>The cron runs as a separate process cron.py. You can run it as often as you
-like, e.g. every five minutes. It maintains internally how often each job needs
-to run.</p></div>
-<div class="paragraph"><p>The jobs that run are defined by CronJob classes, these are currently defined
-in lib/aff4_objects/cronjobs.py</p></div>
+<div class="paragraph"><p>The cron allows for scheduling flows to run regularly on the GRR server.
+This is currently used to collect statistics and do cleanup on the database.
+The cron runs as part of the workers.</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -1338,14 +1334,7 @@ <h3 id="_deploying_arbitrary_python_code">Deploying Arbitrary Python Code.</h3>
 <div class="paragraph"><p>E.g. as a simple example. The following code modifies the clients poll_max
 setting and pings test.com.</p></div>
 <div class="listingblock">
-<div class="content"><!-- Generator: GNU source-highlight 3.1.5
-by Lorenzo Bettini
-http://www.lorenzobettini.it
-http://www.gnu.org/software/src-highlite -->
-<pre><tt><span style="font-weight: bold"><span style="color: #000080">import</span></span> commands
-status<span style="color: #990000">,</span> output <span style="color: #990000">=</span> commands<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #000000">getstatusoutput</span></span><span style="color: #990000">(</span><span style="color: #FF0000">"ping -c 3 test.com"</span><span style="color: #990000">)</span>
-FLAGS<span style="color: #990000">.</span>poll_max <span style="color: #990000">=</span> <span style="color: #993399">100</span>
-magic_return_str <span style="color: #990000">=</span> <span style="color: #FF0000">"poll_max successfully set. ping output %s"</span> <span style="color: #990000">%</span> output</tt></pre></div></div>
+<div class="content"></div></div>
 <div class="paragraph"><p>This file then needs to be signed and converted into the protobuf format
 required, and then needs to be uploaded to the data store. You can do this using
 the following command line.</p></div>
@@ -1428,7 +1417,7 @@ <h3 id="_deploying_executables">Deploying Executables.</h3>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2013-04-06 00:55:09 CEST
+Last updated 2013-07-18 13:17:07 EST
 </div>
 </div>
 </body>

diff --git a/docs/admin.txt b/docs/admin.txt
@@ -347,15 +347,9 @@ to the dev list and we can try and fix things.
 
 Scheduling Flows with Cron
 --------------------------
-The cron allows for scheduling actions to run regularly on the GRR server.
+The cron allows for scheduling flows to run regularly on the GRR server.
 This is currently used to collect statistics and do cleanup on the database.
-
-The cron runs as a separate process cron.py. You can run it as often as you
-like, e.g. every five minutes. It maintains internally how often each job needs
-to run.
-
-The jobs that run are defined by CronJob classes, these are currently defined
-in lib/aff4_objects/cronjobs.py
+The cron runs as part of the workers. 
 
 
 
@@ -535,4 +529,4 @@ db@host:$
 ------------------------------------------------------------------------
 
 This uploads to the installers directory by default. But you can override with
-the --dest_path option. 
+the --dest_path option.