#718 #739: Cambiar la MV base para generar OGAgent usando Fedora 23 Cloud, porque la basada en Ubuntu 14.04 no podía incluir todas las DLLs del instalador del egente para Windows.

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

1 files changed, 12 insertions, 39 deletions

diff --git a/installer/vagrant/Vagrantfile-ogagent-vbox b/installer/vagrant/Vagrantfile-ogagent-vbox
index 0e418b3e..aa1d155c 100644
--- a/installer/vagrant/Vagrantfile-ogagent-vbox
+++ b/installer/vagrant/Vagrantfile-ogagent-vbox
@@ -13,45 +13,19 @@ VMCPUS = 4
 SCRIPT = <<EOT
 # Set language.
 export LANG="#{LANGUAGE}.UTF-8"
-echo "LANG=\"$LANG\"" > /etc/default/locale
-echo "LANG=\"$LANG\"" >> /etc/environment
-echo "LANGUAGE=\"$LANG\"" >> /etc/environment
-echo "LC_ALL=\"$LANG\"" >> /etc/environment
-echo "LC_CTYPE=\"$LANG\"" >> /etc/environment
-locale-gen --lang #{LANGUAGE}
-sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"${LANG%_*}\"/" /etc/default/keyboard
-dpkg-reconfigure -fnoninteractive console-setup
+localedef -v -c -i ${LANG%.*} -f UTF-8 $LANG 2>/dev/null
+localectl set-locale LANG=$LANG
+localectl set-keymap ${LANG%_*}
+localectl set-x11-keymap ${LANG%_*}
 # Update repositories.
-add-apt-repository -y ppa:webupd8team/java
-add-apt-repository -y ppa:ubuntu-wine
-dpkg --add-architecture i386 
-apt-get update
-apt-get -y upgrade
+dnf install -y http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
 # Install main dependencies.
-echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections
-apt-get install -y aspell-${LANG%_*} debhelper dpkg-dev pyqt4-dev-tools realpath rpm subversion winbind wine1.8-i386 wine-gecko2.40:i386 wine-mono4.5.6
+dnf install -y debhelper dpkg-dev pyqt4-devel rpm-build subversion samba-winbind wine.i686 mingw32-wine-gecko wine-mono
 # Install desktop (XFCE) and GUI utils.
-apt-get install -y xfce4 gnome-icon-theme-full tango-icon-theme firefox virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11
-echo "allowed_users=anybody" > /etc/X11/Xwrapper.config
-# Install Oracle Java 8.
-echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
-echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections
-apt-get -y install oracle-java8-installer
-# Install Eclipse Mars.
-echo "Downloading Eclipse..."
-wget -q http://ftp.fau.de/eclipse/technology/epp/downloads/release/mars/2/eclipse-php-mars-2-linux-gtk-x86_64.tar.gz -O /tmp/eclipse-php-mars-2-linux-gtk-x86_64.tar.gz
-tar -C /opt -xvzf /tmp/eclipse-php-mars-2-linux-gtk-x86_64.tar.gz
-# Add Eclipse icon to the desktop.
-mkdir -p /home/vagrant/Escritorio
-mkdir -p /home/vagrant/Escritorio
-echo "#!/usr/bin/env xdg-open" > /home/vagrant/Escritorio/eclipse.desktop
-echo "[Desktop Entry]" >> /home/vagrant/Escritorio/eclipse.desktop
-echo "Name=Eclipse" >> /home/vagrant/Escritorio/eclipse.desktop
-echo "Type=Application" >> /home/vagrant/Escritorio/eclipse.desktop
-echo "Exec=/opt/eclipse/eclipse" >> /home/vagrant/Escritorio/eclipse.desktop
-echo "Icon=/opt/eclipse/icon.xpm" >> /home/vagrant/Escritorio/eclipse.desktop
-echo "Terminal=false" >> /home/vagrant/Escritorio/eclipse.desktop
-chown -R vagrant.vagrant /home/vagrant/Escritorio
+dnf install -y @xfce-desktop-environment firefox eclipse-pydev eclipse-nls-${LANG%_*} VirtualBox-guest kmod-VirtualBox akmod-VirtualBox akmods
+ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target 
+sed -i '$d' /usr/lib/udev/rules.d/60-vboxguest.rules
+akmods && systemctl restart systemd-modules-load.service
 # Download OGAgent environment installer.
 svn export http://opengnsys.es/svn/branches/version1.1/installer/ogagent-devel-installer.sh /home/vagrant
 # Instructions.
@@ -60,9 +34,8 @@ echo "- Launch desktop: startxfce4 &"
 echo "- Enlarge VM window."
 echo "- To prepare OGAgent environment, execute: ./ogagent-devel-installer.sh"
 echo "- Before modify OGAgent code, configure Eclipse:"
-echo "  - Go to Eclipse Marketplace and install PyDev plug-in."
 echo "  - Set Python interpreter on Preferences/PyDev/Interpreters/Python Interpreter."
-echo "  - Create new PyDev Project located on /home/vagrant/ogagent/src directory."
+echo "  - Create a new PyDev Project located in /home/vagrant/ogagent/src directory."
 EOT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
@@ -78,7 +51,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       vb.gui = true
     end
     # VM base and host name.
-    ag.vm.box = "ubuntu/trusty64"
+    ag.vm.box = "fedora/23-cloud-base"
     ag.vm.hostname = "ogAgent"
     # Disable synced folder.
     ag.vm.synced_folder ".", "/vagrant", disabled: true