summaryrefslogtreecommitdiffstats
path: root/installer/opengnsys_installer.sh
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2012-10-25 11:02:24 +0000
committerramon <ramongomez@us.es>2012-10-25 11:02:24 +0000
commit8ff5800314d36611e83ff2475af4333b9f8026bd (patch)
treecdc003eb1b31b1f3112772331a113d6d1feebc11 /installer/opengnsys_installer.sh
parentb5b0d2f71f902e1e251d50c8d2bb74e82d67fb3c (diff)
VersiĆ³n 1.0.4a, #556: Corregidas erratas en instalador:
* detectar las IPs de todas las redes en servidores con varias tarjetas, * parchear correctamente la configuraciĆ³n de Samba, * mostrar la URL de acceso a la consola web usando HTTPS. git-svn-id: https://opengnsys.es/svn/trunk@3378 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'installer/opengnsys_installer.sh')
-rwxr-xr-xinstaller/opengnsys_installer.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index 05f6a1bf..44baafd4 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -690,7 +690,7 @@ function getNetworkSettings()
let i++
done
DNSIP=$(awk '/nameserver/ {print $2}' /etc/resolv.conf | head -n1)
- if [ -z "${NETIP}[*]" -o -z "${NETMASK[*]}" ]; then
+ if [ -z "${NETIP[*]}" -o -z "${NETMASK[*]}" ]; then
errorAndLog "${FUNCNAME}(): Network not detected."
exit 1
fi
@@ -868,7 +868,9 @@ function smbConfigure()
$WORKDIR/opengnsys/server/etc/smb-og.conf.tmpl > $SAMBACFGDIR/smb-og.conf
# Configurar y recargar Samba"
perl -pi -e "s/WORKGROUP/OPENGNSYS/; s/server string \=.*/server string \= OpenGnSys Samba Server/" $SAMBACFGDIR/smb.conf
- test grep -q "smb-og" $SAMBACFGDIR/smb.conf || echo "include = $SAMBACFGDIR/smb-og.conf" >> $SAMBACFGDIR/smb.conf
+ if ! grep -q "smb-og" $SAMBACFGDIR/smb.conf; then
+ echo "include = $SAMBACFGDIR/smb-og.conf" >> $SAMBACFGDIR/smb.conf
+ fi
service=$SAMBASERV
$ENABLESERVICE; $STARTSERVICE
if [ $? -ne 0 ]; then
@@ -1305,7 +1307,7 @@ function openGnsysConfigure()
-e "s/OPENGNSYSURL/${CONSOLEURL//\//\\/}/g" \
$WORKDIR/opengnsys/admin/Sources/Clients/ogAdmClient/ogAdmClient.cfg > $INSTALL_TARGET/client/etc/ogAdmClient-$dev.cfg
if [ "$dev" == "$DEFAULTDEV" ]; then
- OPENGNSYS_CONSOLEURL="$CONSOLEURL"
+ OPENGNSYS_CONSOLEURL="${CONSOLEURL/http:/https:}"
fi
fi
let i++