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

added function to check all dependencies #102

Merged
merged 5 commits into from Oct 10, 2017
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

remove unnecessary prompt

  • Loading branch information
Ubuntu
Ubuntu committed Sep 7, 2017
commit 6239784139983d5a2dab8e2f9d232b7da44d8678
@@ -636,7 +636,8 @@ if [ "$FORCE_SECURE" == "false" ]; then
if [ "$DEPENDENCIES_INSTALLED" == "false" ]; then
if [ "$SUPPRESS_PROMPT" == "false" ]; then
logMsgToConfigSysLog "WARN" "WARN: The rsyslog-gnutls package could not download automatically either because of your package manager could not be found or due to some other reason."
while true; do
while true;
do
read -p "Do you wish to continue with insecure mode? (yes/no)" yn
case $yn in
[Yy]* )
@@ -662,7 +663,6 @@ fi
#write the contents to 22-loggly.conf file
writeContents()
{
checkIfTLS
confString
installTLSDependencies
switchToInsecureModeIfTLSNotFound
@@ -927,35 +927,6 @@ getPassword()
echo
}

#Change TLS settings
checkIfTLS()
{
if [[ $LOGGLY_SYSLOG_PORT == 514 ]]; then

if [ "$SUPPRESS_PROMPT" == "false" ]; then
while true;
do
read -p "Hey, you are going to setup the system logs in insecure mode. Do you want to overwrite this with secure mode? (yes/no)" yn
case $yn in
[Yy]* )
logMsgToConfigSysLog "INFO" "INFO: Going to overwrite the conf file: $LOGGLY_RSYSLOG_CONFFILE with secure configuration";
LOGGLY_TLS_SENDING="true"
LOGGLY_SYSLOG_PORT=6514
break;;
[Nn]* )
break;;
* ) echo "Please answer yes or no.";;
esac
done
else
logMsgToConfigSysLog "WARN" "WARN: Your system logs are being sent insecurely. We prefer to send the system logs securely so switching to the secure configuration."
LOGGLY_TLS_SENDING="true"
LOGGLY_SYSLOG_PORT=6514

fi
fi
}

#display usage syntax
usage()
{
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.