From 7493498f0f5a9ff7d085cfa939c9c003c90050d6 Mon Sep 17 00:00:00 2001 From: j-n-c Date: Tue, 19 Apr 2022 15:57:10 +0100 Subject: [PATCH 1/2] Added /scripts/installer/default.config as the template used in documentation #8481 --- doc/sphinx-guides/source/installation/installation-main.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/installation/installation-main.rst b/doc/sphinx-guides/source/installation/installation-main.rst index 1b426bc0712..430010261b1 100755 --- a/doc/sphinx-guides/source/installation/installation-main.rst +++ b/doc/sphinx-guides/source/installation/installation-main.rst @@ -66,7 +66,7 @@ The script will prompt you for some configuration values. If this is a test/eval - Postgres admin password - We'll need it in order to create the database and user for the Dataverse Software installer to use, without having to run the installer as root. If you don't know your Postgres admin password, you may simply set the authorization level for localhost to "trust" in the PostgreSQL ``pg_hba.conf`` file (See the PostgreSQL section in the Prerequisites). If this is a production environment, you may want to change it back to something more secure, such as "password" or "md5", after the installation is complete. - Network address of a remote Solr search engine service (if needed) - In most cases, you will be running your Solr server on the same host as the Dataverse Software application (then you will want to leave this set to the default value of ``LOCAL``). But in a serious production environment you may set it up on a dedicated separate server. -If desired, these default values can be configured by creating a ``default.config`` (example :download:`here <../_static/util/default.config>`) file in the installer's working directory with new values (if this file isn't present, the above defaults will be used). +If desired, these default values can be configured by creating a ``default.config`` (example :download:`here <../../../../scripts/installer/default.config>`) file in the installer's working directory with new values (if this file isn't present, the above defaults will be used). This allows the installer to be run in non-interactive mode (with ``./install -y -f > install.out 2> install.err``), which can allow for easier interaction with automated provisioning tools. From ebc6c2366de231e3039ada5f771b38b1e84db2c5 Mon Sep 17 00:00:00 2001 From: j-n-c Date: Fri, 22 Apr 2022 12:07:09 +0100 Subject: [PATCH 2/2] #8481 Removed old (wrong format) file --- .../source/_static/util/default.config | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 doc/sphinx-guides/source/_static/util/default.config diff --git a/doc/sphinx-guides/source/_static/util/default.config b/doc/sphinx-guides/source/_static/util/default.config deleted file mode 100644 index 48252caf1c9..00000000000 --- a/doc/sphinx-guides/source/_static/util/default.config +++ /dev/null @@ -1,15 +0,0 @@ -HOST_DNS_ADDRESS localhost -GLASSFISH_DIRECTORY /usr/local/glassfish4 -ADMIN_EMAIL -MAIL_SERVER mail.hmdc.harvard.edu -POSTGRES_ADMIN_PASSWORD secret -POSTGRES_SERVER 127.0.0.1 -POSTGRES_PORT 5432 -POSTGRES_DATABASE dvndb -POSTGRES_USER dvnapp -POSTGRES_PASSWORD secret -SOLR_LOCATION localhost:8983 -RSERVE_HOST localhost -RSERVE_PORT 6311 -RSERVE_USER rserve -RSERVE_PASSWORD rserve