Skip to content
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

Check and switch existing logging mode #104

Merged
merged 4 commits into from Oct 10, 2017

Conversation

@Shwetajain148
Copy link
Contributor

@Shwetajain148 Shwetajain148 commented Sep 18, 2017

@mchaudhary @mostlyjason, In this PR, I am checking whether the user is running the dependent scripts in secure or insecure mode, based on the script running mode, I am checking if the existing port in 22-loggly.conf file is same as the running mode of the script For example if the user is running the file-monitoring script in secure mode but 22-loggly.conf is set with insecure config then the script will prompt to switch system config to secure mode as well and vice versa.

Please review.

if [ -f $LOGGLY_RSYSLOG_CONFFILE ]; then
if [[ $RSYSLOG_VERSION_TMP -le "7" ]]; then
EXISTING_SYSLOG_PORT=$(grep 6514 $LOGGLY_RSYSLOG_CONFFILE | awk {'print $2'} | cut -d':' -f2 | cut -d';' -f1)
elif [[ "$RSYSLOG_VERSION_TMP" -ge "8" ]]; then

This comment has been minimized.

@mostlyjason

mostlyjason Sep 18, 2017
Contributor

I'm not sure you should switch this off the version number, since the newer versions are also compatible with the legacy syntax

This comment has been minimized.

@Shwetajain148

Shwetajain148 Sep 19, 2017
Author Contributor

@mostlyjason Actually the TLS configuration for rsyslog version less than 7 and greater than 8 is different and since I need to grep the port 6514 from the TLS configuration of 22-loggly.conf file, I had to use two grep commands to grep port 6514 from different places in both the configurations.

TLS configuration for rsyslog version less than 7 can be see here- https://github.com/loggly/install-script/blob/master/Linux%20Script/configure-linux.sh#L521-L546

TLS configuration for rsyslog version greater than 8 can be see here- https://github.com/loggly/install-script/blob/master/Linux%20Script/configure-linux.sh#L549-L569

That is why I used two different commands to grep the 6514 port based on rsyslog versions.

Also, the NON-TLS configuration is same for any rsyslog version so I used only one grep command to pick the port 514 from 22-loggly.conf file.

case $yn in
[Yy]* )
logMsgToConfigSysLog "INFO" "INFO: Going to overwrite the conf file: $LOGGLY_RSYSLOG_CONFFILE with insecure configuration";
LOGGLY_TLS_SENDING="false"

This comment has been minimized.

@mchaudhary

mchaudhary Oct 10, 2017
Contributor

Please fix the indentation for the next PR. @Shweta-jain please create JIRA for it.

@mchaudhary mchaudhary merged commit 1da44af into loggly:master Oct 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.