Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts: rudder-webapp/SOURCES/rudder-upgrade
amousset · Nov 23, 2015 · bdb8ad6 · bdb8ad6
2 parents fb608c6 + 6389071
commit bdb8ad6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/rudder-webapp/SOURCES/rudder-upgrade b/rudder-webapp/SOURCES/rudder-upgrade
@@ -330,15 +330,15 @@ upgrade_ncf() {
   # Make sure that ncf uses the right logger bundles (_logger_default and logger_rudder)
   STEP="Make sure that ncf uses the right logger bundles (_logger_default and logger_rudder)"
 
-  if ! grep -Eq "^loggers=.*logger_rudder.*" ${RUDDER_NCF_SOURCE_DIRECTORY}/tree/ncf.conf; then
-    sed -i "s%^loggers=\(.*\)%loggers=\1,logger_rudder%" ${RUDDER_NCF_SOURCE_DIRECTORY}/tree/ncf.conf
+  if ! grep -Eq "^loggers=.*logger_rudder.*" ${VAR_RUDDER}/ncf/common/ncf.conf; then
+    sed -i "s%^loggers=\(.*\)%loggers=\1,logger_rudder%" ${VAR_RUDDER}/ncf/common/ncf.conf
   fi
 
   # Make sure that ncf uses the right CFEngine port (5309)
   STEP="Make sure that ncf uses the right CFEngine port (5309)"
 
-  if ! grep -Eq "^cfengine_port=5309" ${RUDDER_NCF_SOURCE_DIRECTORY}/tree/ncf.conf; then
-    sed -i "s%^cfengine_port=.*%cfengine_port=5309%" ${RUDDER_NCF_SOURCE_DIRECTORY}/tree/ncf.conf
+  if ! grep -Eq "^cfengine_port=5309" ${VAR_RUDDER}/ncf/common/ncf.conf; then
+    sed -i "s%^cfengine_port=.*%cfengine_port=5309%" ${VAR_RUDDER}/ncf/common/ncf.conf
   fi
 }