Patch from Dan Scott to provide better default configuration examples for Evergreen

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7624 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/opensrf.xml.example b/Open-ILS/examples/opensrf.xml.example
index 367dd41..d6d853c 100644 (file)
--- a/Open-ILS/examples/opensrf.xml.example
+++ b/Open-ILS/examples/opensrf.xml.example
@@ -42,7 +42,7 @@ Example opensrf config file for OpenILS
                     <driver>Pg</driver>
                     <host>localhost</host>
                     <port>5432</port>
-                    <name>evergreen</name>
+                    <db>evergreen</db>
                     <user>postgres</user>
                     <password>postgres</password>
                 </database>
@@ -475,9 +475,9 @@ Example opensrf config file for OpenILS
                 <implementation>OpenILS::Application::Storage</implementation>
                 <unix_config>
                     <max_requests>1000</max_requests>
-                    <unix_log>storage_unix.log</unix_log>
-                    <unix_sock>storage_unix.sock</unix_sock>
-                    <unix_pid>storage_unix.pid</unix_pid>
+                    <unix_log>openils.storage_unix.log</unix_log>
+                    <unix_sock>openils.storage_unix.sock</unix_sock>
+                    <unix_pid>openils.storage_unix.pid</unix_pid>
                     <min_children>1</min_children>
                     <max_children>10</max_children>
                     <min_spare_children>1</min_spare_children>
@@ -544,7 +544,7 @@ Example opensrf config file for OpenILS
                 <max_requests>17</max_requests>
                 <unix_config>
                     <unix_sock>opensrf.settings_unix.sock</unix_sock>
-                    <unix_pid>opoensrf.settings_unix.pid</unix_pid>
+                    <unix_pid>opensrf.settings_unix.pid</unix_pid>
                     <max_requests>300</max_requests>
                     <unix_log>opensrf.settings_unix.log</unix_log>
                     <min_children>5</min_children>
@@ -561,10 +561,10 @@ Example opensrf config file for OpenILS
                 <implementation>OpenILS::Application::Collections</implementation>
                 <max_requests>17</max_requests>
                 <unix_config>
-                    <unix_sock>opensrf.collections_unix.sock</unix_sock>
-                    <unix_pid>opoensrf.collections_unix.pid</unix_pid>
+                    <unix_sock>openils.collections_unix.sock</unix_sock>
+                    <unix_pid>openils.collections_unix.pid</unix_pid>
                     <max_requests>1000</max_requests>
-                    <unix_log>opensrf.collections_unix.log</unix_log>
+                    <unix_log>openils.collections_unix.log</unix_log>
                     <min_children>1</min_children>
                     <max_children>10</max_children>
                     <min_spare_children>1</min_spare_children>
@@ -579,10 +579,10 @@ Example opensrf config file for OpenILS
                 <implementation>OpenILS::Application::Reporter</implementation>
                 <max_requests>99</max_requests>
                 <unix_config>
-                    <unix_sock>opensrf.reporter_unix.sock</unix_sock>
-                    <unix_pid>opoensrf.reporter_unix.pid</unix_pid>
+                    <unix_sock>openils.reporter_unix.sock</unix_sock>
+                    <unix_pid>openils.reporter_unix.pid</unix_pid>
                     <max_requests>1000</max_requests>
-                    <unix_log>opensrf.reporter_unix.log</unix_log>
+                    <unix_log>openils.reporter_unix.log</unix_log>
                     <min_children>1</min_children>
                     <max_children>10</max_children>
                     <min_spare_children>1</min_spare_children>

diff --git a/Open-ILS/src/Makefile b/Open-ILS/src/Makefile
index e94f0df..8c5bf70 100644 (file)
--- a/Open-ILS/src/Makefile
+++ b/Open-ILS/src/Makefile
@@ -123,6 +123,7 @@ perl-install:
        cp extras/ils_events.xml $(DATADIR)
        cp -r perlmods/* $(PERLDIR)
        cp ../examples/opensrf.xml.example $(ETCDIR)
+       cp ../examples/opensrf_core.xml.example $(ETCDIR)
        cp ../examples/fm_IDL.xml $(ETCDIR)
        cp ../examples/oils_sip.xml.example $(ETCDIR)
        cp ../examples/hold_notification_template.example $(DATADIR)