diff --git a/doc/sphinx-guides/source/installation/installation-main.rst b/doc/sphinx-guides/source/installation/installation-main.rst index 59adb185d25..adc191d066b 100755 --- a/doc/sphinx-guides/source/installation/installation-main.rst +++ b/doc/sphinx-guides/source/installation/installation-main.rst @@ -72,6 +72,8 @@ This allows the installer to be run in non-interactive mode (with ``./install -y All the Payara configuration tasks performed by the installer are isolated in the shell script ``dvinstall/as-setup.sh`` (as ``asadmin`` commands). +While Postgres can accomodate usernames and database names containing hyphens, it is strongly recommended to use only alphanumeric characters. + **IMPORTANT:** As a security measure, the ``as-setup.sh`` script stores passwords as "aliases" rather than plaintext. If you change your database password, for example, you will need to update the alias with ``asadmin update-password-alias db_password_alias``, for example. Here is a list of the password aliases that are set by the installation process and entered into Payara's ``domain.xml`` file: - ``db_password_alias`` diff --git a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java index 556c2294bda..f27c7c712dc 100644 --- a/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java +++ b/src/main/java/edu/harvard/iq/dataverse/SettingsWrapper.java @@ -125,7 +125,7 @@ public String getGuidesBaseUrl() { if (true) if (guidesBaseUrl == null) { - String saneDefault = "http://guides.dataverse.org"; + String saneDefault = "https://guides.dataverse.org"; guidesBaseUrl = getValueForKey(SettingsServiceBean.Key.GuidesBaseUrl); if (guidesBaseUrl == null) { diff --git a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java index 4699ec6c326..a1ed4877f39 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/SystemConfig.java @@ -366,7 +366,7 @@ public String getDataverseServer() { } public String getGuidesBaseUrl() { - String saneDefault = "http://guides.dataverse.org"; + String saneDefault = "https://guides.dataverse.org"; String guidesBaseUrl = settingsService.getValueForKey(SettingsServiceBean.Key.GuidesBaseUrl, saneDefault); return guidesBaseUrl + "/" + getGuidesLanguage(); }