#19 change extra passwords in manage

Author: Remold Krol

configs/surfconext/manage.ini

@@ -12,10 +12,10 @@ auth.simplesamlphp.idp.binding    = "urn:oasis:names:tc:SAML:2.0:bindings:HTTP-R
 ; Portal database
 ; Portal stuff is no longer supported in OpenConext
 ; ToDo: remove dependencies on below credentials
-resources.multidb.coin_portal.host      = "localhost"
-resources.multidb.coin_portal.username  = "root"
-resources.multidb.coin_portal.password  = "c0n3xt"
-resources.multidb.coin_portal.dbname    = "portal"
+;resources.multidb.coin_portal.host      = "localhost"
+;resources.multidb.coin_portal.username  = "xxx"
+;resources.multidb.coin_portal.password  = "xxx"
+;resources.multidb.coin_portal.dbname    = "portal"
 
 ; Engine database
 resources.multidb.engine_block.host     = "localhost"

scripts/components/manage.sh

@@ -35,11 +35,15 @@ sed -e "s/_OPENCONEXT_DOMAIN_/$OC_DOMAIN/g" $OC_BASEDIR/configs/surfconext/manag
 # Apply credentials to file manage.ini
 sed -i "s/__OC__MANAGE_DB_USER__/$OC__MANAGE_DB_USER/g" /etc/surfconext/manage.ini
 sed -i "s/__OC__MANAGE_DB_PASS__/$OC__MANAGE_DB_PASS/g" /etc/surfconext/manage.ini
-sed -i "s/__OC__ENGINEBLOCK_DB_USER__/$OC__ENGINEBLOCK_DB_USER/g" /etc/surfconext/manage.ini
-sed -i "s/__OC__ENGINEBLOCK_DB_PASS__/$OC__ENGINEBLOCK_DB_PASS/g" /etc/surfconext/manage.ini
+sed -i "s/__OC__ENGINE_DB_USER__/$OC__ENGINE_DB_USER/g" /etc/surfconext/manage.ini
+sed -i "s/__OC__ENGINE_DB_PASS__/$OC__ENGINE_DB_PASS/g" /etc/surfconext/manage.ini
 sed -i "s/__OC__SERVICEREGISTRY_DB_USER__/$OC__SERVICEREGISTRY_DB_USER/g" /etc/surfconext/manage.ini
 sed -i "s/__OC__SERVICEREGISTRY_DB_PASS__/$OC__SERVICEREGISTRY_DB_PASS/g" /etc/surfconext/manage.ini
 
+
+# When manage.ini still contains the default root password of the DB, change it to the oc_config value.
+sed -i "s~c0n3xt~$OC__ROOT_DB_PASS~g" /etc/surfconext/manage.ini
+
 CRT_NO_HEADERS=`sed '1d;$d' /etc/surfconext/engineblock.crt` &&
 echo "auth.simplesamlphp.idp.cert = \"${CRT_NO_HEADERS}\"" >> /etc/surfconext/manage.ini