Skip to content

Commit

Permalink
Merge pull request #860 from jooooooon/bug_7776/rudder_init_overwrite…
Browse files Browse the repository at this point in the history
…_its_logs

Fixes #7776: rudder-init overwrite its logs
  • Loading branch information
peckpeck committed Jan 15, 2016
2 parents 08365ee + 6993c07 commit 232e74e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions rudder-webapp/SOURCES/rudder-init
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,10 @@ LDAPInit()
sed -i "s/^\([^#].*\)%%POLICY_SERVER_HOSTNAME%%/\1${RUDDER_HOSTNAME}/g" $INITPOLICY_PATH
sed -i "s#^\([^#].*\)%%POLICY_SERVER_ALLOWED_NETWORKS%%#\1$NET#g" $INITPOLICY_PATH

${LDAPADD} -f $BOOTSTRAP_PATH &> $TMP_LOG
${LDAPADD} -f $BOOTSTRAP_PATH &>> $TMP_LOG
ErrorCheck

${LDAPADD} -f $INITPOLICY_PATH &> $TMP_LOG
${LDAPADD} -f $INITPOLICY_PATH &>> $TMP_LOG
ErrorCheck
}

Expand Down Expand Up @@ -363,9 +363,9 @@ echo -n "Restarting services..."

## Manually launch cf-agent to set up policy server
# Running failsafe will create required directories (such as /var/rudder/ncf/local) and populate tools
cf-agent -f failsafe.cf &> "$TMP_LOG"
cf-agent -f failsafe.cf &>> "$TMP_LOG"
# Run all server-specific bundles (except propagatePromises, because they're aren't any yet)
cf-agent -b propagatePromises,install_rsyslogd,root_component_check &> "$TMP_LOG"
cf-agent -b propagatePromises,install_rsyslogd,root_component_check &>> "$TMP_LOG"

## Then, restart jetty
${JETTY_INIT} restart >> "${TMP_LOG}" 2>&1 || echo "WARNING: Jetty failed to start, maybe there is not enough RAM or swap on the machine. Skipping..."
Expand Down

0 comments on commit 232e74e

Please sign in to comment.