summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamón M. Gómez <ramongomez@us.es>2019-06-07 11:16:31 +0200
committerRamón M. Gómez <ramongomez@us.es>2019-06-07 11:16:31 +0200
commit6a2bd870329061679618e23ddb13164018c1de06 (patch)
tree74b982d1d6ed3eb09472054d84d0ad95f097faae
parent3b5c09aa536eb11ef6e24edfef8b8bebf1e8613c (diff)
#914: Removing redundant permissions.
-rwxr-xr-xinstaller/opengnsys_installer.sh15
-rw-r--r--repoman/etc/rsyncd.secrets.tmpl1
-rwxr-xr-xserver/bin/setsmbpass2
3 files changed, 1 insertions, 17 deletions
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index c50d4cee..a5b5cb58 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -991,12 +991,6 @@ function rsyncConfigure()
# Configurar acceso a Rsync.
sed -e "s/CLIENTUSER/$OPENGNSYS_CLIENT_USER/g" \
$WORKDIR/opengnsys/repoman/etc/rsyncd.conf.tmpl > $RSYNCCFGDIR/rsyncd.conf
- sed -e "s/CLIENTUSER/$OPENGNSYS_CLIENT_USER/g" \
- -e "s/CLIENTPASSWORD/$OPENGNSYS_CLIENT_PASSWD/g" \
- $WORKDIR/opengnsys/repoman/etc/rsyncd.secrets.tmpl > $RSYNCCFGDIR/rsyncd.secrets
- chown root.root $RSYNCCFGDIR/rsyncd.secrets
- chmod 600 $RSYNCCFGDIR/rsyncd.secrets
-
# Habilitar Rsync y reiniciar Inetd.
if [ -n "$RSYNCSERV" ]; then
if [ -f /etc/default/rsync ]; then
@@ -1378,8 +1372,6 @@ function copyInterfaceAdm ()
echoAndLog "${FUNCNAME}(): error while copying Administration Interface Folder"
hayErrores=1
fi
- chown $OPENGNSYS_CLIENT_USER:$OPENGNSYS_CLIENT_USER $INSTALL_TARGET/client/interfaceAdm/CambiarAcceso
- chmod 700 $INSTALL_TARGET/client/interfaceAdm/CambiarAcceso
return $hayErrores
}
@@ -1445,9 +1437,6 @@ function clientCreate()
echoAndLog "${FUNCNAME}(): Installing ogLive Client"
echo -ne "$OPENGNSYS_CLIENT_PASSWD\n$OPENGNSYS_CLIENT_PASSWD\n" | \
oglivecli install $FILENAME
- # Adaptar permisos.
- chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $INSTALL_TARGET/tftpboot/menu.lst
- chown -R $APACHE_RUN_USER:$APACHE_RUN_GROUP $INSTALL_TARGET/tftpboot/grub
echoAndLog "${FUNCNAME}(): Client generation success"
}
@@ -1519,10 +1508,6 @@ function openGnsysConfigure()
ln -f $INSTALL_TARGET/etc/ogAdmAgent-$DEFAULTDEV.cfg $INSTALL_TARGET/etc/ogAdmAgent.cfg
ln -f $INSTALL_TARGET/client/etc/ogAdmClient-$DEFAULTDEV.cfg $INSTALL_TARGET/client/etc/ogAdmClient.cfg
ln -f $INSTALL_TARGET/www/controlacceso-$DEFAULTDEV.php $INSTALL_TARGET/www/controlacceso.php
- chown root:root $INSTALL_TARGET/etc/{ogAdmServer,ogAdmAgent}*.cfg
- chmod 600 $INSTALL_TARGET/etc/{ogAdmServer,ogAdmAgent}*.cfg
- chown $APACHE_RUN_USER:$APACHE_RUN_GROUP $INSTALL_TARGET/www/controlacceso*.php
- chmod 600 $INSTALL_TARGET/www/controlacceso*.php
# Configuración del motor de clonación.
# - Zona horaria del servidor.
diff --git a/repoman/etc/rsyncd.secrets.tmpl b/repoman/etc/rsyncd.secrets.tmpl
deleted file mode 100644
index 92a79be6..00000000
--- a/repoman/etc/rsyncd.secrets.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-CLIENTUSER:CLIENTPASSWORD
diff --git a/server/bin/setsmbpass b/server/bin/setsmbpass
index 2162b3be..4d91973d 100755
--- a/server/bin/setsmbpass
+++ b/server/bin/setsmbpass
@@ -105,7 +105,7 @@ for OGLIVE in $LIST; do
done
if [[ $CHANGES != 0 ]]; then
# Ticket 565, preparar acceso Rsync servidor.
- echo "$SAMBAUSER:$SAMBAPASS" > /etc/rsyncd.secrets
+ sed -i -n -e "/^$SAMBAUSER:/!p" -e "$ a$SAMBAUSER:$SAMBAPASS" /etc/rsyncd.secrets
chown root.root /etc/rsyncd.secrets
chmod 600 /etc/rsyncd.secrets
# Cambiar clave Samba.