Skip to content
Snippets Groups Projects
Commit baa826f7 authored by McConahy, Renee Margaret's avatar McConahy, Renee Margaret
Browse files

Escape values in LOCKSS configuration file.

This caused a problem with the LOCKSS 2.0-alpha2 configuration, where
LOCKSS_ACCESS_SUBNET used semicolons to separate values, but it should
be done generally.
parent 7b78344a
No related branches found
No related tags found
No related merge requests found
...@@ -140,22 +140,22 @@ ...@@ -140,22 +140,22 @@
content: | content: |
LOCKSS_CONFIG_VERSION=2 LOCKSS_CONFIG_VERSION=2
LOCKSS_USER=lockss LOCKSS_USER=lockss
LOCKSS_HOSTNAME={{ lockss_hostname }} LOCKSS_HOSTNAME={{ lockss_hostname | quote }}
LOCKSS_IPADDR={{ lockss_ipaddr }} LOCKSS_IPADDR={{ lockss_ipaddr | quote }}
LOCKSS_EXTERNAL_IPADDR={{ lockss_external_ipaddr }} LOCKSS_EXTERNAL_IPADDR={{ lockss_external_ipaddr | quote }}
LOCKSS_V3_PORT=9729 LOCKSS_V3_PORT=9729
LOCKSS_ACCESS_SUBNET={{ lockss_access_subnet }} LOCKSS_ACCESS_SUBNET={{ lockss_access_subnet | quote }}
LOCKSS_MAILHUB={{ lockss_mailhub_host | default("localhost") }} LOCKSS_MAILHUB={{ lockss_mailhub_host | default("localhost") | quote }}
LOCKSS_MAILHUB_USER={{ lockss_mailhub_user | default }} LOCKSS_MAILHUB_USER={{ lockss_mailhub_user | default | quote }}
LOCKSS_MAILHUB_PASSWORD={{ lockss_mailhub_password | default }} LOCKSS_MAILHUB_PASSWORD={{ lockss_mailhub_password | default | quote }}
LOCKSS_EMAIL={{ lockss_admin_email }} LOCKSS_EMAIL={{ lockss_admin_email | quote }}
LOCKSS_PROPS_URL={{ lockss_props_url }} LOCKSS_PROPS_URL={{ lockss_props_url | quote }}
LOCKSS_PROPS_PROXY=NONE LOCKSS_PROPS_PROXY=NONE
LOCKSS_PROPS_SERVER_AUTHENTICATE_KEYSTORE= LOCKSS_PROPS_SERVER_AUTHENTICATE_KEYSTORE=
LOCKSS_TEST_GROUP=demo LOCKSS_TEST_GROUP=demo
LOCKSS_DATA_DIR={{ lockss_data_dir }} LOCKSS_DATA_DIR={{ lockss_data_dir | quote }}
LOCKSS_LOGS_DIR=/var/log/lockss LOCKSS_LOGS_DIR=/var/log/lockss
LOCKSS_ADMIN_USER={{ lockss_ui_user | default("admin") }} LOCKSS_ADMIN_USER={{ lockss_ui_user | default("admin") | quote }}
LOCKSS_ADMIN_PASSWD=SHA-256:{{ lockss_ui_password | hash('sha256') }} LOCKSS_ADMIN_PASSWD=SHA-256:{{ lockss_ui_password | hash('sha256') }}
LOCKSS_DB_PASSWD=SHA-256:{{ lockss_db_password | hash('sha256') }} LOCKSS_DB_PASSWD=SHA-256:{{ lockss_db_password | hash('sha256') }}
LOCKSS_PROXY_PORT=24670 LOCKSS_PROXY_PORT=24670
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment