-
Notifications
You must be signed in to change notification settings - Fork 24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Suse 12 support #57
Conversation
fac1d6b
to
dfeb577
Compare
Please don't merge it yet. When rsyslog is started the following error occurs:
|
Previous version SLES11.3 uses version rsyslog-5.10 while SLES12 uses rsyslog-8.10. Setting to compatibility mode to version 4 (like it's done for RHEL7) fixes this issue. Since compatibility mode is used for RHEL7 I guess it should be used on SLES12 as well. |
dfeb577
to
252b55d
Compare
Nevermind. Compatibility mode seems to have been removed in version 8 or earlier.
|
@ghoneycutt It seems like it's not an acceptable syntax to send messages to everyone logged in. Previously it was ok to say output is '' now it needs to be ':omusrmsg:' instead. How do you want this implemented? Do you want a new configuration version added (rsyslog_conf_version). However it would be quite a jump from configuration version 2 and 3 to 8. |
Hello again. I'll be adding version 5 of the rsyslog config. Module ":omusrmsg:*" was implemented in rsyslog 5 and will be used instead of * for emergency messages. This will require a few changes to the module however. Please don't merge the pull request in its current state. A new revision will be available as soon as I'm ready. Thank you. |
7ba3e70
to
1fe0c6f
Compare
Please have a look now :) |
1fe0c6f
to
44d99b0
Compare
I've tested this commit on the versions mentioned below. Rsyslog config version will be bumped to v5 on systems which are >= 5. These systems will also use ':omusrmsg:' instead of ''.
|
@Phil-Friderici In light of PR #58 do you mind rebasing this one after #58 is rebased? |
@ghoneycutt What's needed for this request to be merged? Are we waiting for a rebase? |
This was waiting on #61 to be merged, which I just did and released as v0.14.0. It now needs to be rebased and tested. |
44d99b0
to
0a077a0
Compare
@ghoneycutt I've rebased the changes and verified it on the following versions:
|
0a077a0
to
6023e53
Compare
The code shows that it supports rsyslog v2, 3 and 5, though your testing shows it also work with v4, 7 and 8. Shouldn't we change the code around here[1] to show that? I think it is safe to safe we support rsyslog v2-8, would you agree? |
Oh and thanks again for taking the time to rebase and see this through, I appreciate it! |
Agreed. We should be able change that line to all versions between version 2 and 8. I found an issue with logrotate and SLES12 (or actually systemd) since /etc/init.d/rsyslog doesn't exist anymore with systemd. We could change '/etc/init.d/syslog reload > /dev/null' with 'service syslog reload > /dev/null'. I've verified that it works on SLES 10.{2,3,4} and SLES 11.{0.1.2.3} and finally SLES12. Otherwise we'll need to add a specific code path for SLES 12. |
@anders-larsson good point. I would also prefer to switch to 'service syslog reload'. |
639a02a
to
b2f5a47
Compare
I've amended my previous change with the changes we've mentioned. Please verify it looks OK. Would be awesome if someone could test it as well since it actually does quite a few changes to the module. However it doesn't work to define rsyslog_conf_version as an integera in hiera at the moment. It can only be sent to the module as an string. I'm not really a fan of converting everything to strings just to convert it back to an integer in the class. What's your suggestion? |
Ugh.. we have to support strings in Hiera. On the brighter side, I think that the way strings work in Puppet/Ruby, it should just work. :) |
Strings does work. However giving an integer input in hiera does not. Is it supported to supply integers to classes in hiera? |
I meant that you have to assume people will use strings in Hiera |
@anders-larsson how's it coming with this? |
@ghoneycutt the code support strings. It expect the user to pass the strings 'USE_DEFAULTS' or '2' to '8' into $rsyslog_conf_version. What did we miss here ? |
Looks good, just needs a rebase |
feasible ;) |
b2f5a47
to
969e369
Compare
Rebased! :) |
Released in v0.16.0 |
File 'sysconfig.suse12.erb' is the stock version of /etc/sysconfig/syslog with the comment (#) removed from the 'RSYSLOGD_PARAMS' line. rsyslog is started with '-n' as argument in either case.