diff options
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/syslog.py (renamed from src/conf_mode/system-syslog.py) | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/conf_mode/system-syslog.py b/src/conf_mode/syslog.py index f238acc15..c4f3d2c9c 100755 --- a/src/conf_mode/system-syslog.py +++ b/src/conf_mode/syslog.py @@ -53,9 +53,9 @@ $outchannel {{file}},{{files[file]['log-file']}},{{files[file]['max-size']}},{{f ## remote logging {% for host in hosts %} {% if hosts[host]['proto'] == 'tcp' %} -{{hosts[host]['selectors']}} @@{{host}}:{{hosts[host]['port']}} +{{hosts[host]['selectors']}} @@{{host}} {% else %} -{{hosts[host]['selectors']}} @{{host}}:{{hosts[host]['port']}} +{{hosts[host]['selectors']}} @{{host}} {% endif %} {% endfor %} {% endif %} @@ -177,22 +177,19 @@ def get_config(): # set system syslog host if c.exists('host'): - rhosts = c.list_nodes(['host']) + proto = 'udp' + rhosts = c.list_nodes('host') for rhost in rhosts: - if c.exists('host ' + rhost + ' port'): - port = c.return_value(['host', rhost, 'port']) - else: - port = '514' - if c.exists('host ' + rhost + ' protocol'): - proto = c.return_value(['host', rhost, 'protocol']) - else: - proto = 'udp' + for fac in c.list_nodes('host ' + rhost + ' facility'): + if c.exists('host ' + rhost + ' facility ' + fac + ' protocol'): + proto = c.return_value( + 'host ' + rhost + ' facility ' + fac + ' protocol') + config_data['hosts'].update( { rhost: { 'selectors': generate_selectors(c, 'host ' + rhost + ' facility'), - 'proto': proto, - 'port' : port + 'proto': proto } } ) @@ -292,6 +289,7 @@ def verify(c): for s in c[conf][item]['selectors'].split(";"): f = re.sub("\..*$", "", s) if f not in fac: + print (c[conf]) raise ConfigError( 'Invalid facility ' + s + ' set in ' + conf + ' ' + item) l = re.sub("^.+\.", "", s) @@ -299,6 +297,7 @@ def verify(c): raise ConfigError( 'Invalid logging level ' + s + ' set in ' + conf + ' ' + item) + def apply(c): if not c and os.path.exists('/var/run/rsyslogd.pid'): os.system("sudo systemctl stop syslog.socket") |