Merge pull request #159 from bjwhite-fnal/make_logging_envvar_consistent

Make name of logging selector env var consistent across all containers. Closes #158
rucio · Oct 5, 2021 · ef5f5e2 · ef5f5e2
2 parents 8c35ca6 + e9bd4f5
commit ef5f5e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/server/README.md b/server/README.md
@@ -66,7 +66,7 @@ By default the output of the Apache web server is written directly to stdout and
       -v /tmp/rucio.cfg:/opt/rucio/etc/rucio.cfg \
       -v /tmp/logs:/var/log/httpd \
       -p 80:80 \
-      -e RUCIO_ENABLE_LOGFILE=True \
+      -e RUCIO_ENABLE_LOGS=True \
       rucio/rucio-server
 
 ## Environment Variables
@@ -93,7 +93,7 @@ This variable is used to set SSLCARevocationCheck. The default value is "chain".
 
 By default the web server is configured with all common rest endpoints except the authentication endpoint. If you want to specify your own set of aliases you can set this variable to `True`. The web server then expects an alias file under `/opt/rucio/etc/aliases.conf`
 
-### `RUCIO_ENABLE_LOGFILE`
+### `RUCIO_ENABLE_LOGS`
 
 By default the log output of the web server is written to stdout and stderr. If you set this variable to `True` the output will be written to `access_log` and `error_log` under `/var/log/httpd`.
 

diff --git a/server/rucio.conf.j2 b/server/rucio.conf.j2
@@ -72,7 +72,7 @@ CacheRoot /tmp
  LogLevel info
 {% endif %}
 
-{% if RUCIO_ENABLE_LOGFILE|default('False') == 'True' %}
+{% if RUCIO_ENABLE_LOGS|default('False') == 'True' %}
  CustomLog logs/access_log combinedrucio
  ErrorLog logs/error_log
 {% else %}

diff --git a/ui/README.md b/ui/README.md
@@ -59,13 +59,13 @@ Same as `RUCIO_PROXY_SCHEME` but for the authentication server.
 
 If you are using SSL and want use `SSLCACertificatePath` and `SSLCARevocationPath` you can do so by specifying the path in this variable.
 
-### `RUCIO_ENABLE_LOGFILE`
+### `RUCIO_ENABLE_LOGS`
 
 By default the log output of the web server is written to stdout and stderr. If you set this variable to `True` the output will be written to `access_log` and `error_log` under `/var/log/httpd`.
 
 ### `RUCIO_HTTPD_LOG_DIR`
 
-If `RUCIO_ENABLE_LOGFILE` is set use this variable to change the default logfile output directory.
+If `RUCIO_ENABLE_LOGS` is set use this variable to change the default logfile output directory.
 
 ### `RUCIO_LOG_LEVEL`
 

diff --git a/ui/rucio.conf.j2 b/ui/rucio.conf.j2
@@ -61,7 +61,7 @@ CacheRoot /tmp
  LogLevel info
 {% endif %}
 
-{% if RUCIO_ENABLE_LOGFILE|default('False') == 'True' %}
+{% if RUCIO_ENABLE_LOGS|default('False') == 'True' %}
 {% if RUCIO_HTTPD_LOG_DIR is defined %}
  CustomLog {{RUCIO_HTTPD_LOG_DIR}}/access_log combinedrucio
  ErrorLog {{RUCIO_HTTPD_LOG_DIR}}/error_log