diff options
author | ramon <ramongomez@us.es> | 2017-12-14 13:22:15 +0000 |
---|---|---|
committer | ramon <ramongomez@us.es> | 2017-12-14 13:22:15 +0000 |
commit | 3bf09ba36ef87167703b79d56c330c979fd1302c (patch) | |
tree | b90f33254fb208c9f7f1311e6e958d6c6c545b43 /installer | |
parent | fce0af30c330da39d8af2bf97c895b3fbec4d62b (diff) |
#743: Mejoras en petición Wake-On-Lan a repositorio:
* documentar API REST,
* hacer una única llamada múltiple a todos los repositorios afectados,
* mostrar aviso si ha habido algún problema de conexión con un repo,
* incluir dependencias de instalación/actualización.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5534 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'installer')
-rwxr-xr-x | installer/opengnsys_installer.sh | 4 | ||||
-rwxr-xr-x | installer/opengnsys_update.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index 14ad5d32..8570d36b 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -167,7 +167,7 @@ OSVERSION="${OSVERSION%%.*}" # Configuración según la distribución GNU/Linux (usar minúsculas). case "$OSDISTRIB" in ubuntu|debian|linuxmint) - DEPENDENCIES=( subversion apache2 php5 php5-ldap libapache2-mod-php5 mysql-server php5-mysql isc-dhcp-server bittorrent tftp-hpa tftpd-hpa xinetd build-essential g++-multilib libmysqlclient15-dev wget curl doxygen graphviz bittornado ctorrent samba rsync unzip netpipes debootstrap schroot squashfs-tools btrfs-tools procps arp-scan realpath php5-curl gettext moreutils jq ) + DEPENDENCIES=( subversion apache2 php5 php5-ldap libapache2-mod-php5 mysql-server php5-mysql isc-dhcp-server bittorrent tftp-hpa tftpd-hpa xinetd build-essential g++-multilib libmysqlclient15-dev wget curl doxygen graphviz bittornado ctorrent samba rsync unzip netpipes debootstrap schroot squashfs-tools btrfs-tools procps arp-scan realpath php5-curl gettext moreutils jq wakeonlan ) UPDATEPKGLIST="apt-get update" INSTALLPKG="apt-get -y install --force-yes" CHECKPKG="dpkg -s \$package 2>/dev/null | grep Status | grep -qw install" @@ -204,7 +204,7 @@ case "$OSDISTRIB" in TFTPCFGDIR=/var/lib/tftpboot ;; fedora|centos) - DEPENDENCIES=( subversion httpd mod_ssl php php-ldap mysql-server mysql-devel mysql-devel.i686 php-mysql dhcp tftp-server tftp xinetd binutils gcc gcc-c++ glibc-devel glibc-devel.i686 glibc-static glibc-static.i686 libstdc++ libstdc++.i686 libstdc++-devel.i686 make wget curl doxygen graphviz ctorrent samba samba-client rsync unzip debootstrap schroot squashfs-tools python-crypto arp-scan gettext moreutils jq ) + DEPENDENCIES=( subversion httpd mod_ssl php php-ldap mysql-server mysql-devel mysql-devel.i686 php-mysql dhcp tftp-server tftp xinetd binutils gcc gcc-c++ glibc-devel glibc-devel.i686 glibc-static glibc-static.i686 libstdc++ libstdc++.i686 libstdc++-devel.i686 make wget curl doxygen graphviz ctorrent samba samba-client rsync unzip debootstrap schroot squashfs-tools python-crypto arp-scan gettext moreutils jq wakeonlan ) INSTALLEXTRADEPS=( 'rpm -Uv ftp://ftp.altlinux.org/pub/distributions/ALTLinux/5.1/branch/files/i586/RPMS/netpipes-4.2-alt1.i586.rpm' 'pushd /tmp; wget -t3 http://download.bittornado.com/download/BitTornado-0.3.18.tar.gz && tar xvzf BitTornado-0.3.18.tar.gz && cd BitTornado-CVS && python setup.py install && ln -fs btlaunchmany.py /usr/bin/btlaunchmany && ln -fs bttrack.py /usr/bin/bttrack; popd' ) if [ "$OSDISTRIB" == "centos" ]; then diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index 262dedfe..d6a238c7 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -113,7 +113,7 @@ OSVERSION="${OSVERSION%%.*}" # Configuración según la distribución de Linux. case "$OSDISTRIB" in ubuntu|debian|linuxmint) - DEPENDENCIES=( php5-ldap xinetd curl rsync btrfs-tools procps arp-scan realpath php5-curl gettext moreutils jq ) + DEPENDENCIES=( curl rsync btrfs-tools procps arp-scan realpath php5-curl gettext moreutils jq wakeonlan ) UPDATEPKGLIST="apt-get update" INSTALLPKGS="apt-get -y install --force-yes" CHECKPKG="dpkg -s \$package 2>/dev/null | grep -q \"Status: install ok\"" @@ -130,7 +130,7 @@ case "$OSDISTRIB" in INETDCFGDIR=/etc/xinetd.d ;; fedora|centos) - DEPENDENCIES=( php-ldap xinetd curl rsync btrfs-progs procps-ng arp-scan gettext moreutils jq ) + DEPENDENCIES=( curl rsync btrfs-progs procps-ng arp-scan gettext moreutils jq wakeonlan ) # En CentOS 7 instalar arp-scan de CentOS 6. [ "$OSDISTRIB$OSVERSION" == "centos7" ] && DEPENDENCIES=( ${DEPENDENCIES[*]/arp-scan/http://dag.wieers.com/redhat/el6/en/$(arch)/dag/RPMS/arp-scan-1.9-1.el6.rf.$(arch).rpm} ) INSTALLPKGS="yum install -y" |