#718: Instrucciones para instalar OGAgent para macOS; no usar Winetricks en nuevas distribuciones para crear OGAgent para Windows y usar Fedora 25 en MV Vagrant.

git-svn-id: https://opengnsys.es/svn/branches/version1.1@5229 a21b9725-9963-47de-94b9-378ad31fedc9

4 files changed, 22 insertions, 7 deletions

diff --git a/admin/Sources/Clients/ogagent/windows/py2exe-wine-linux.sh b/admin/Sources/Clients/ogagent/windows/py2exe-wine-linux.sh
index 96031879..6abcb9a7 100755
--- a/admin/Sources/Clients/ogagent/windows/py2exe-wine-linux.sh
+++ b/admin/Sources/Clients/ogagent/windows/py2exe-wine-linux.sh
@@ -2,7 +2,7 @@
 
 # We need:
 # * Wine (32 bit)
-# * winetricks
+# * winetricks (in some distributions)
 
 export WINEARCH=win32
 WINE=wine
@@ -25,8 +25,10 @@ download() {
 install_python() {
     WINEPREFIX=`pwd`/wine
     export WINEPREFIX
-    echo "Setting up wine prefix (using winetricks)"
-    winetricks
+    if which winetricks &>/dev/null; then
+        echo "Setting up wine prefix (using winetricks)"
+        winetricks
+    fi
     
     cd downloads
     echo "Installing python"
diff --git a/admin/WebConsole/descargas/README.es.txt b/admin/WebConsole/descargas/README.es.txt
index 309cf2dd..e62cebef 100644
--- a/admin/WebConsole/descargas/README.es.txt
+++ b/admin/WebConsole/descargas/README.es.txt
@@ -8,6 +8,7 @@ Ficheros disponibles para descarga de agente OGAgent:
  - ogagent_Version_all.deb      OGAgent para sistemas Ubuntu, Debian y derivados
  - ogagent-Version.noarch.rpm   OGAgent para sistemas Red Hat, Fedora y derivados
  - ogagent-opensuse-Version.noarch.rpm   OGAgent para sistemas SuSE y OpenSuSE
+ - OGAgentInstaller-Version.pkg OGAgent para sistemas macOS X
  - OGAgentSetup-Version.exe     OGAgent para sistemas Windows
 
 
@@ -32,10 +33,22 @@ Instalación manual de los agentes.
 	chmod +x /etc/init.d/ogagent
    - Iniciar el servicio (se iniciará automáticamente en el proceso de arranque):
 	service ogagent start
+   - Iniciar el servicio (se iniciará automáticamente en el proceso de arranque):
+	sudo ogagent start
 
  - OpenSuSE:
 	(en preparación)
 
+ - macOS X:
+   - Instalar dependencias:
+	sudo easy_install pip
+	sudo pip install netifaces requests six
+   - Descargar e instalar el agente:
+	sudo installer -pkg OGAgentInstaller-Version.pkg -target /
+   - Configurar el agente:
+	sudo sed "/remote=/ s,remote=.*,remote=https://IPServidorOpenGnsys/opengnsys/rest/," /Applications/OGAgent.app/cfg/ogagent.cfg > /tmp/ogagent.cfg
+	sudo mv /tmp/ogagent.cfg /Applications/OGAgent.app/cfg/ogagent.cfg
+
  - Windows (como usuario administrador):
    - Descargar e instalar el agente ejecutando:
 	OGAgentSetup-Version.exe
diff --git a/installer/ogagent-devel-installer.sh b/installer/ogagent-devel-installer.sh
index 44af1c3a..97a4e697 100755
--- a/installer/ogagent-devel-installer.sh
+++ b/installer/ogagent-devel-installer.sh
@@ -22,7 +22,7 @@ OGAgent devoloping environment installation
 
 Prerequisites:
 - Install packages, if needed:
-  - Wine for 32-bit with Winetricks
+  - Wine for 32-bit (Winetricks may be required)
   - Python 2.7 with pyqt4-dev-tools
   - realpath
   - dpkg-dev
@@ -47,8 +47,8 @@ cat << EOT
 
 Manual actions:
 - After all downloads, install Gecko for Wine, if needed.
-- Press [Esc] key or "Cancel" button on Winetricks screen.
-- Accept default settings for all other components
+- Press [Esc] key or "Cancel" button on Winetricks screen, if needed.
+- Accept default settings for all other components.
 - Uncheck all options on "Completing NSIS Setup" screen.
 Press [Enter] key to init downloads. 
 
diff --git a/installer/vagrant/Vagrantfile-ogagent-vbox b/installer/vagrant/Vagrantfile-ogagent-vbox
index d2a49aed..6bd042cc 100644
--- a/installer/vagrant/Vagrantfile-ogagent-vbox
+++ b/installer/vagrant/Vagrantfile-ogagent-vbox
@@ -59,7 +59,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       vb.gui = true
     end
     # VM base and host name.
-    ag.vm.box = "fedora/24-cloud-base"
+    ag.vm.box = "fedora/25-cloud-base"
     ag.vm.hostname = "ogAgent"
     # Comment to disable synced folder.
     ag.vm.synced_folder ".", "/vagrant"