From f128cdce1b2ee7ecdb530082386f3d9f24f8228a Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sat, 18 Nov 2023 14:17:30 -0800
Subject: [PATCH] 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     |  9 +++++++++
 apps/uppercase_out    | 15 +++++++++++++++
 html/inc/util_ops.inc |  2 +-
 tools/backend_lib.h   |  4 ++--
 tools/make_project    | 19 ++++++-------------
 5 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 apps/uppercase_in
 create mode 100644 apps/uppercase_out

diff --git a/apps/uppercase_in b/apps/uppercase_in
new file mode 100644
index 0000000000..6161529447
--- /dev/null
+++ b/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>
diff --git a/apps/uppercase_out b/apps/uppercase_out
new file mode 100644
index 0000000000..96f8f51abc
--- /dev/null
+++ b/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>
diff --git a/html/inc/util_ops.inc b/html/inc/util_ops.inc
index 5972e7744e..9b2dc00aff 100644
--- a/html/inc/util_ops.inc
+++ b/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) {
diff --git a/tools/backend_lib.h b/tools/backend_lib.h
index 8e55325631..7add38dfb3 100644
--- a/tools/backend_lib.h
+++ b/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
diff --git a/tools/make_project b/tools/make_project
index 5545427c68..c7d579d0b8 100755
--- a/tools/make_project
+++ b/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)