Minor changes to facilitate the server setup demo:

- Instructions for Apache: copy config file to sites_enabled/
    rather than appending it to the main config file
- default job replication is 1
- fix format of items on op pages

apps/uppercase_in

@@ -0,0 +1,9 @@
+<input_template>
+    <file_info>
+    </file_info>
+    <workunit>
+        <file_ref>
+            <open_name>in</open_name>
+        </file_ref>
+    </workunit>
+</input_template>

apps/uppercase_out

@@ -0,0 +1,15 @@
+<output_template>
+    <file_info>
+        <name><OUTFILE_0/></name>
+        <generated_locally/>
+        <upload_when_present/>
+        <max_nbytes>5000000</max_nbytes>
+        <url><UPLOAD_URL/></url>
+    </file_info>
+    <result>
+        <file_ref>
+            <file_name><OUTFILE_0/></file_name>
+            <open_name>out</open_name>
+        </file_ref>
+    </result>
+</output_template>

html/inc/util_ops.inc

@@ -83,7 +83,7 @@ function print_text_field($text,$name,$value) {
 }
 
 function row($x, $y) {
-    echo "<tr><td valign=\"top\" align=\"right\">$x</td>\n<td>$y</td>\n</tr>\n";
+    echo "<tr><td width=30% valign=\"top\" align=\"right\">$x &nbsp;&nbsp; </td>\n<td>$y</td>\n</tr>\n";
 }
 
 function c_row2($color, $x, $y) {

tools/backend_lib.h

@@ -26,8 +26,8 @@
 
 // default job parameters
 //
-#define DEFAULT_MIN_QUORUM  2
-#define DEFAULT_TARGET_NRESULTS 2
+#define DEFAULT_MIN_QUORUM  1
+#define DEFAULT_TARGET_NRESULTS 1
 #define DEFAULT_MAX_ERROR_RESULTS 3
 #define DEFAULT_MAX_TOTAL_RESULTS 10
 #define DEFAULT_MAX_SUCCESS_RESULTS 6

tools/make_project

@@ -468,19 +468,12 @@ html_ops_url = options.html_ops_url
 
 content = '''Steps to complete installation:
 
--  Change Apache configuration (as root):
-
-   If you are using Apache 2.4, edit the %(httpd_conf_template_filename)s
-   (see file for specific instructions).
-
-   cat %(httpd_conf_template_filename)s >> /etc/apache/httpd.conf
-
-   (path to httpd.conf varies; try /etc/httpd/ or /etc/apache2)
-
-   Then restart the web server:
-
-   /usr/sbin/apache2ctl restart
-   (or /usr/sbin/apachectl restart)
+-  Update Apache configuration (as root):
+    (make sure you have apache2 2.4 or later)
+    install config file:
+        cp %(httpd_conf_template_filename)s /etc/apache2/sites-enabled
+    restart apache:
+        apache2ctl restart
 
 -  Add to crontab (as %(USER)s)