diff options
| author | ramon <ramongomez@us.es> | 2012-01-19 08:58:34 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2012-01-19 08:58:34 +0000 |
| commit | 70710e7ce0c21220e17009c0f8ad0e48c7909f98 (patch) | |
| tree | 6c685cb37f156848a72c8e5c362550ba8ceae7b8 | |
| parent | e7b31544a385c68c031aeec19a0f3516b5be9ee9 (diff) | |
Versión 1.0.2a, #478, #480: En servidores con varias interfaces: instalador muestra URL por defecto, evitar duplicados al dar de alta el servidor en la BD.
git-svn-id: https://opengnsys.es/svn/trunk@2448 a21b9725-9963-47de-94b9-378ad31fedc9
| -rw-r--r-- | admin/Database/ogAdmBD-1.0.2-1.0.2a.sql | 2 | ||||
| -rwxr-xr-x | installer/opengnsys_installer.sh | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/admin/Database/ogAdmBD-1.0.2-1.0.2a.sql b/admin/Database/ogAdmBD-1.0.2-1.0.2a.sql index 256f39ac..14009064 100644 --- a/admin/Database/ogAdmBD-1.0.2-1.0.2a.sql +++ b/admin/Database/ogAdmBD-1.0.2-1.0.2a.sql @@ -1,2 +1,2 @@ -UPDATE ogAdmBD.entornos SET ipserveradm = 'SERVERIP' WHERE ipserveradm = ''; +UPDATE ogAdmBD.entornos SET ipserveradm = 'SERVERIP' WHERE ipserveradm = '' LIMIT 1; diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index 6039e295..85da1364 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -1072,6 +1072,7 @@ function openGnsysConfigure() { local i=0 local dev="" + local CONSOLEURL echoAndLog "${FUNCNAME}(): Copying init files." cp -p $WORKDIR/opengnsys/admin/Sources/Services/opengnsys.init /etc/init.d/opengnsys @@ -1102,16 +1103,19 @@ function openGnsysConfigure() -e "s/DBPASSWORD/$OPENGNSYS_DB_PASSWD/g" \ -e "s/DATABASE/$OPENGNSYS_DATABASE/g" \ $WORKDIR/opengnsys/admin/Sources/Services/ogAdmAgent/ogAdmAgent.cfg > $INSTALL_TARGET/etc/ogAdmAgent-$dev.cfg - OPENGNSYS_CONSOLEURL="http://${SERVERIP[i]}/opengnsys" + CONSOLEURL="http://${SERVERIP[i]}/opengnsys" sed -e "s/SERVERIP/${SERVERIP[i]}/g" \ -e "s/DBUSER/$OPENGNSYS_DB_USER/g" \ -e "s/DBPASSWORD/$OPENGNSYS_DB_PASSWD/g" \ -e "s/DATABASE/$OPENGNSYS_DATABASE/g" \ - -e "s/OPENGNSYSURL/${OPENGNSYS_CONSOLEURL//\//\\/}/g" \ + -e "s/OPENGNSYSURL/${CONSOLEURL//\//\\/}/g" \ $INSTALL_TARGET/www/controlacceso.php > $INSTALL_TARGET/www/controlacceso-$dev.php sed -e "s/SERVERIP/${SERVERIP[i]}/g" \ -e "s/OPENGNSYSURL/${OPENGNSYS_CONSOLEURL//\//\\/}/g" \ $WORKDIR/opengnsys/admin/Sources/Clients/ogAdmClient/ogAdmClient.cfg > $INSTALL_TARGET/client/etc/ogAdmClient-$dev.cfg + if [ "$dev" == "$DEFAULTDEV" ]; then + OPENGNSYS_CONSOLEURL="$CONSOLEURL" + fi fi let i++ done |