Merge branch 'master' into devel

Author: brianshumate

README.md

@@ -120,21 +120,47 @@ Many role variables can also take their values from environment variables as wel
 
 - Enable configuration of rsyslogd or syslog-ng on Linux. If disabled, Consul will still log to syslog if `consul_syslog_enable` is true, but the syslog daemon won't be configured to write Consul logs to their own logfile.
   - Override with `CONSUL_CONFIGURE_SYSLOGD` environment variable
-- Default Linux value: *true*
+- Default Linux value: *false*
 
 ### `consul_log_path`
-
-- Log path for use in rsyslogd configuration on Linux. Ignored if `consul_configure_syslogd` is false.
+- If `consul_syslog_enable` is false
+  - Log path for use in [log_file or -log-file](https://www.consul.io/docs/agent/options.html#_log_file)
+- If `consul_syslog_enable` is true
+  - Log path for use in rsyslogd configuration on Linux. Ignored if `consul_configure_syslogd` is false.
 - Default Linux value: `/var/log/consul`
   - Override with `CONSUL_LOG_PATH` environment variable
 - Default Windows value: `C:\ProgramData\consul\log`
 
 ### `consul_log_file`
 
-- Log file for use in rsyslogd configuration on Linux. Ignored if `consul_configure_syslogd` is false.
-  - Override with `CONSUL_LOG_FILE` environment variable
+- If `consul_syslog_enable` is false
+  - Log file for use in [log_file or -log-file](https://www.consul.io/docs/agent/options.html#_log_file)
+- If `consul_syslog_enable` is true
+  - Log file for use in rsyslogd configuration on Linux. Ignored if `consul_configure_syslogd` is false.
+- Override with `CONSUL_LOG_FILE` environment variable
 - Default Linux value: `consul.log`
 
+### `consul_log_rotate_bytes`
+
+- Log rotate bytes as defined in [log_rotate_bytes or -log-rotate-bytes](https://www.consul.io/docs/agent/options.html#_log_rotate_bytes)
+  - Override with `CONSUL_LOG_ROTATE_BYTES` environment variable
+- Ignored if `consul_syslog_enable` is true
+- Default value: 0
+
+### `consul_log_rotate_duration`
+
+- Log rotate bytes as defined in [log_rotate_duration or -log-rotate-duration](https://www.consul.io/docs/agent/options.html#_log_rotate_duration)
+  - Override with `CONSUL_LOG_ROTATE_DURATION` environment variable
+- Ignored if `consul_syslog_enable` is true
+- Default value: 24h
+
+### `consul_log_rotate_max_files`
+
+- Log rotate bytes as defined in [log_rotate_max_files or -log-rotate-max-files](https://www.consul.io/docs/agent/options.html#_log_rotate_max_files)
+  - Override with `CONSUL_LOG_ROTATE_MAX_FILES` environment variable
+- Ignored if `consul_syslog_enable` is true
+- Default value: 0
+
 ### `consul_syslog_facility`
 
 - Syslog facility as defined in [syslog_facility](https://www.consul.io/docs/agent/options.html#syslog_facility)
@@ -273,7 +299,7 @@ consul_node_meta:
 
 - Log to syslog as defined in [enable_syslog or -syslog](https://www.consul.io/docs/agent/options.html#_syslog)
   - Override with `CONSUL_SYSLOG_ENABLE` environment variable
-- Default Linux value: true
+- Default Linux value: false
 - Default Windows value: false
 
 ### `consul_iface`

defaults/main.yml

@@ -56,9 +56,12 @@ consul_systemd_limit_nofile: 65536
 syslog_user: "{{ lookup('env','SYSLOG_USER') | default('root', true) }}"
 syslog_group: "{{ lookup('env','SYSLOG_GROUP') | default('adm', true) }}"
 consul_log_level: "{{ lookup('env','CONSUL_LOG_LEVEL') | default('INFO', true) }}"
-consul_syslog_enable: "{{ lookup('env','CONSUL_SYSLOG_ENABLE') | default(true, true) }}"
+consul_log_rotate_bytes: "{{ lookup('env','CONSUL_LOG_ROTATE_BYTES') | default(0, true) }}"
+consul_log_rotate_duration: "{{ lookup('env','CONSUL_LOG_ROTATE_DURATION') | default('24h', true) }}"
+consul_log_rotate_max_files: "{{ lookup('env','CONSUL_LOG_ROTATE_MAX_FILES') | default(0, true) }}"
+consul_syslog_enable: "{{ lookup('env','CONSUL_SYSLOG_ENABLE') | default(false, true) }}"
 consul_syslog_facility: "{{ lookup('env','CONSUL_SYSLOG_FACILITY') | default('local0', true) }}"
-consul_configure_syslogd: "{{ lookup('env','CONSUL_CONFIGURE_SYSLOGD') | default(true, true) }}"
+consul_configure_syslogd: "{{ lookup('env','CONSUL_CONFIGURE_SYSLOGD') | default(false, true) }}"
 
 ### Consul settings
 consul_datacenter: "{{ lookup('env','CONSUL_DATACENTER') | default('dc1', true) }}"

templates/config.json.j2

@@ -57,8 +57,15 @@
     {## Agent ##}
     "data_dir": "{{ consul_data_path }}",
     "log_level": "{{ consul_log_level }}",
+    {% if consul_syslog_enable | bool %}
     "enable_syslog": {{ consul_syslog_enable | bool | to_json }},
     "syslog_facility": "{{ consul_syslog_facility }}",
+    {% else %}
+    "log_file": "{{ consul_log_path }}/{{ consul_log_file }}",
+    "log_rotate_bytes": {{ consul_log_rotate_bytes }},
+    "log_rotate_duration": "{{ consul_log_rotate_duration }}",
+    "log_rotate_max_files": {{ consul_log_rotate_max_files }},
+    {% endif %}
     "disable_update_check": {{ consul_disable_update_check | bool | to_json }},
     "enable_script_checks": {{ consul_enable_script_checks | bool | to_json }},
     "enable_local_script_checks": {{ consul_enable_local_script_checks | bool | to_json }},