f36905ad1a0299cf06301340e937beddd913c26d
configuration/sailing
| ... | ... | @@ -116,11 +116,17 @@ configure_and_start_server() { |
| 116 | 116 | # Now loop over all EVENT_ID specification keys and produce an "Event-SSL" macro invocation for each: |
| 117 | 117 | for i in ${!EVENT_ID[*]}; do |
| 118 | 118 | echo "Appending macro invocation to ${reverse_proxy_config_file} to map ${EVENT_HOSTNAME[$i]} to event with ID ${EVENT_ID[$i]} with server running on local port $SERVER_PORT..." >>/var/log/sailing.err |
| 119 | + if [ -z "${EVENT_HOSTNAME[$i]}" ]; then |
|
| 120 | + EVENT_HOSTNAME[$i]="${SERVER_NAME}.sapsailing.com" |
|
| 121 | + fi |
|
| 119 | 122 | echo "## EVENT ${EVENT_HOSTNAME[$i]}" >>"${reverse_proxy_config_file}" |
| 120 | 123 | echo "Use Event-SSL ${EVENT_HOSTNAME[$i]} \"${EVENT_ID[$i]}\" 127.0.0.1 $SERVER_PORT" >>"${reverse_proxy_config_file}" |
| 121 | 124 | done |
| 122 | 125 | # Now loop over all SERIES_ID specification keys and produce an "Series-SSL" macro invocation for each: |
| 123 | 126 | for i in ${!SERIES_ID[*]}; do |
| 127 | + if [ -z "${SERIES_HOSTNAME[$i]}" ]; then |
|
| 128 | + SERIES_HOSTNAME[$i]="${SERVER_NAME}.sapsailing.com" |
|
| 129 | + fi |
|
| 124 | 130 | echo "Appending macro invocation to ${reverse_proxy_config_file} to map ${SERIES_HOSTNAME[$i]} to event with ID ${SERIES_ID[$i]} with server running on local port $SERVER_PORT..." >>/var/log/sailing.err |
| 125 | 131 | echo "## SERIES ${SERIES_HOSTNAME[$i]}" >>"${reverse_proxy_config_file}" |
| 126 | 132 | echo "Use Series-SSL ${SERIES_HOSTNAME[$i]} \"${SERIES_ID[$i]}\" 127.0.0.1 $SERVER_PORT" >>"${reverse_proxy_config_file}" |
wiki/info/landscape/amazon-ec2.md
| ... | ... | @@ -166,7 +166,10 @@ More variables are available, and some variables---if not set in the environment |
| 166 | 166 | * `MAIL_SMTP_PASSWORD` |
| 167 | 167 | Password for SMTP authentication; used if `MAIL_SMTP_AUTH` is `true`. The standard image has a pre-defined file under `/home/sailing/servers/server/configuration/mail.properties` which contains credentials and configuration for our standard Amazon Simple Email Service (AWS SES) configuration. |
| 168 | 168 | |
| 169 | -* `EVENT_ID`... |
|
| 169 | +* `EVENT_ID` |
|
| 170 | + Used to specify one or more UUIDs of events for which to create a reverse proxy mapping in `/etc/httpd/conf.d/${SERVER_NAME}.conf`. If only a single event ID is specified, as in ``EVENT_ID=34ebf96f-594b-4948-b9ea-e6074107b3e0`` then the `${EVENT_HOSTNAME}` is used as the hostname, or if `EVENT_HOSTNAME` is not specified, defaulting to `${SERVER_NAME}.sapsailing.com`, and a mapping using the `Event-SSL` macro is performed. The variable can also be used in Bash Array notation to specify more than one event ID, as in ``EVENT_ID[0]=34ebf96f-594b-4948-b9ea-e6074107b3e0`` and then ``EVENT_HOSTNAME[0]=...`` would specify the corresponding hostname (again defaulting to `${SERVER_NAME}.sapsailing.com`), followed by ``EVENT_ID[1]=...`` and then optionally ``EVENT_HOSTNAME[1]=...``, and so on. |
|
| 171 | + |
|
| 172 | +* `EVENT_HOSTNAME` |
|
| 170 | 173 | |
| 171 | 174 | * `SERIES_ID`... |
| 172 | 175 |