Index: tareas_puppet/servidores_aula/iceweasel_32bits_64bits/manifests/init.pp
===================================================================
--- tareas_puppet/servidores_aula/iceweasel_32bits_64bits/manifests/init.pp	(revision 257)
+++ tareas_puppet/servidores_aula/iceweasel_32bits_64bits/manifests/init.pp	(nonexistent)
@@ -1,21 +0,0 @@
-
-class iceweasel_32bits_64bits {
-
-
-  file { "/usr/local/bin/iceweasel":
-        owner=>root, group=>root, mode=>755,
-        source=>"puppet:///iceweasel_32bits_64bits/iceweasel",
-        notify => Exec["cambiar-iceweasel"],
-  }
-
-
-  exec { "cambiar-iceweasel":
-	path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-        command => "rm -f /usr/local/bin/firefox",
-        command => "ln -sf /usr/local/bin/iceweasel /usr/local/bin/firefox",
-	subscribe => File["/usr/local/bin/iceweasel"],
-	refreshonly => true,
-       }
-
-}
-
Index: tareas_puppet/servidores_aula/iceweasel_32bits_64bits/files/iceweasel
===================================================================
--- tareas_puppet/servidores_aula/iceweasel_32bits_64bits/files/iceweasel	(revision 257)
+++ tareas_puppet/servidores_aula/iceweasel_32bits_64bits/files/iceweasel	(nonexistent)
@@ -1,9 +0,0 @@
-#!/bin/sh
-if [ ! -z "$LTSP_CLIENT" ]; then
-
-        echo "iceweasel $@">$HOME/local.exec
-
-else
-        /usr/bin/iceweasel "$@"
-fi
-

Property changes on: tareas_puppet/servidores_aula/iceweasel_32bits_64bits/files/iceweasel
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: tareas_puppet/servidores_aula/iceweasel_32bits_64bits/leeme.txt
===================================================================
--- tareas_puppet/servidores_aula/iceweasel_32bits_64bits/leeme.txt	(revision 257)
+++ tareas_puppet/servidores_aula/iceweasel_32bits_64bits/leeme.txt	(nonexistent)
@@ -1,7 +0,0 @@
-Tarea de puppet que cambia el enlace /usr/local/bin/firefox que apunta a /usr/local/bin/firefox32 y que produce un error
-hacia el fichero correcto /usr/local/bin/iceweasel. Este fichero interpreta si es un thinclient el que está ejecutando el navegador o es el servidor de aula.
-En caso de que sea un thinclient se ejecuta el iceweasel de 32 bits y en caso de que sea el servidor de aula 64 bits.
-
-Francisco Rodrigo López
-IES Javier Garcia Tellez (Cáceres)
-Marzo 2011
Index: tareas_puppet/servidores_aula/actualiza-flashplugin/files/actualizar-flashplugin.sh
===================================================================
--- tareas_puppet/servidores_aula/actualiza-flashplugin/files/actualizar-flashplugin.sh	(revision 257)
+++ tareas_puppet/servidores_aula/actualiza-flashplugin/files/actualizar-flashplugin.sh	(nonexistent)
@@ -1,47 +0,0 @@
-#!/bin/sh
-# Francisco Rodrigo (IES Javier Garc�a T�llez - C�ceres)
-# Actualizaci�n de los plugin de flash tanto para 32 bits como para 64 bits
-# -------------------------------------------------------------------------
-
-if [ ! -e /root/descargas ];  then mkdir /root/descargas;  fi
-cd /root/descargas
-
-wget -q http://servidor/ficheros/libflashplayer.so
-wget -q http://servidor/ficheros/install_flash_player_10_linux.deb
-
-# Instala en profesor
-if [ -e libflashplayer.so ]; then
-	# Desinstalamos y purgamos:
-	apt-get -y remove --force-yes --purge mozilla-plugin-gnash swfdec-mozilla
-	# Quitamos el enlace del plugin de flash 9 del paquete nspluginwrapper
-	rm /usr/lib/mozilla/plugins/flash-mozilla.so
-
-	# Descomprimimos y movemos al lugar correcto
-	chmod 755 libflashplayer.so
-	chown root:root libflashplayer.so
-	mv -f libflashplayer.so /usr/lib/flashplugin-nonfree/
-
-	#Actualizamos enlaces
-	ln -s /usr/lib/flashplugin-nonfree/libflashplayer.so /usr/lib/iceweasel/plugins/
-	ln -s /usr/lib/flashplugin-nonfree/libflashplayer.so /usr/lib/firefox/plugins/
-	ln -s /usr/lib/flashplugin-nonfree/libflashplayer.so /usr/lib/mozilla/plugins/
-	ln -s /usr/lib/flashplugin-nonfree/libflashplayer.so /usr/lib64/xulrunner-addons/plugins/
-fi
-
-#Instala en terminales
-if [ -e install_flash_player_10_linux.deb ]; then
-  cp install_flash_player_10_linux.deb /opt/ltsp/i386/
-  chroot /opt/ltsp/i386 apt-get -y remove --force-yes --purge mozilla-plugin-gnash swfdec-mozilla flashplugin-nonfree
-  chroot /opt/ltsp/i386 dpkg -i install_flash_player_10_linux.deb
-  rm -f /opt/ltsp/i386/install_flash_player_10_linux.deb
-
-
-  #regeneramos la imagen
-  ltsp-update-image --arch i386
-fi
-
-cd -
-rm -f /root/descargas/*flash* 2>/dev/null
-
-# Los terminales deberán reiniciar para cargar la nueva imagen.
-

Property changes on: tareas_puppet/servidores_aula/actualiza-flashplugin/files/actualizar-flashplugin.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: tareas_puppet/servidores_aula/actualiza-flashplugin/leeme.txt
===================================================================
--- tareas_puppet/servidores_aula/actualiza-flashplugin/leeme.txt	(revision 257)
+++ tareas_puppet/servidores_aula/actualiza-flashplugin/leeme.txt	(nonexistent)
@@ -1,21 +0,0 @@
-BREVE DESCRIPCION DE LA EJECUCION DEL MODULO
---------------------------------------------
-
-Destino : Servidores de aula, e imagen de clientes.
-Acci�n  : Actualizar la versi�n de flash del navegador a la version 10 en el servidor de aula y en la imagen.
-
-Notas   : Necesita que los ficheros a instalar esten en /var/www/ficheros/
-	  del servidor principal, pues los recoge de ah� v�a wget. 
-
-
-INSTRUCCIONES DE INSTALACION DEL MODULO
----------------------------------------
-
-Desempaquetar en /etc/puppet/modules
-Incluir la linea include "nombre_modulo" en /etc/puppet/manifests/classes/clase-especifica.pp
-
-------------------------------------------------
-
-22-Marzo-2011.
-Francisco Rodrigo L�pez
-Administrador inform�tico del IES Javier Garc�a T�llez - C�ceres.

Property changes on: tareas_puppet/servidores_aula/actualiza-flashplugin/leeme.txt
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: tareas_puppet/servidores_aula/actualiza-flashplugin/manifests/init.pp
===================================================================
--- tareas_puppet/servidores_aula/actualiza-flashplugin/manifests/init.pp	(revision 257)
+++ tareas_puppet/servidores_aula/actualiza-flashplugin/manifests/init.pp	(nonexistent)
@@ -1,19 +0,0 @@
-# /etc/puppet/modules/actualiza-flashplugin/manifests/init.pp
-
-class actualiza-flashplugin {
-
-   file {"/root/actualizar-flashplugin.sh":
-        owner=>root, group=>root, mode=>755,
-        source=>"puppet:///actualiza-flashplugin/actualizar-flashplugin.sh",
-        notify => Exec["actualizar-flashplugin"]
-        }
-
-   exec {"actualizar-flashplugin":
-	command => "/root/actualizar-flashplugin.sh",
-	subscribe => File["/root/actualizar-flashplugin.sh"],
-        refreshonly => true
-       }
-
-}
-
-
Index: tareas_puppet/servidores_aula/iceweasel_32bits_64bits.tgz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tareas_puppet/servidores_aula/iceweasel_32bits_64bits.tgz
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: tareas_puppet/servidores_aula/instala-sun-java6.tgz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tareas_puppet/servidores_aula/instala-sun-java6.tgz
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: tareas_puppet/servidores_aula/instala-sun-java6/files/preseed.sun
===================================================================
--- tareas_puppet/servidores_aula/instala-sun-java6/files/preseed.sun	(revision 257)
+++ tareas_puppet/servidores_aula/instala-sun-java6/files/preseed.sun	(nonexistent)
@@ -1,6 +0,0 @@
-sun-java6-bin	shared/accepted-sun-dlj-v1-1	boolean	true
-sun-java6-jre	shared/accepted-sun-dlj-v1-1	boolean	true
-sun-java6-jre	sun-java6-jre/stopthread	boolean	true
-sun-java6-jre	sun-java6-jre/jcepolicy	note	
-sun-java6-bin	shared/present-sun-dlj-v1-1	note	
-sun-java6-jre	shared/present-sun-dlj-v1-1	note	
Index: tareas_puppet/servidores_aula/instala-sun-java6/leeme.txt
===================================================================
--- tareas_puppet/servidores_aula/instala-sun-java6/leeme.txt	(revision 257)
+++ tareas_puppet/servidores_aula/instala-sun-java6/leeme.txt	(nonexistent)
@@ -1,19 +0,0 @@
-BREVE DESCRIPCION DE LA EJECUCION DEL MODULO
---------------------------------------------
-
-Tarea que nos permite instalar el sun-java6 (ver 6.0.26) en los servidores de aula e imagen de clientes.
-
-También rehace los enlaces de /etc/alternatives para que apunten al plugin correcto.
-
-INSTRUCCIONES DE INSTALACION DEL MODULO
----------------------------------------
-
-Desempaquetar en /etc/puppet/modules
-Incluir la linea include "nombre_modulo" en /etc/puppet/manifests/classes/clase-especifica.pp
-Añadir las lineas de los paquetes dentro de /etc/puppet/files/mayhave.ltspserver del servidor nfs.
-(En este caso son sun-java6-jre sun-java6-bin sun-java6-plugin sun-java6-fonts
--------------------------------------------------------------------------------------------------
-
-26-Octubre-2011.
-Francisco Rodrigo Lopez
-Administrador informatico del IES Javier Garcia Tellez

Property changes on: tareas_puppet/servidores_aula/instala-sun-java6/leeme.txt
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: tareas_puppet/servidores_aula/instala-sun-java6/manifests/init.pp
===================================================================
--- tareas_puppet/servidores_aula/instala-sun-java6/manifests/init.pp	(revision 257)
+++ tareas_puppet/servidores_aula/instala-sun-java6/manifests/init.pp	(nonexistent)
@@ -1,52 +0,0 @@
-# /etc/puppet/modules/instala-sun-java6/manifests/init.pp
-
-class instala-sun-java6 {
-   
-        file { "/var/log/preseed.sun":
-        owner => root, group => root, mode => 644,
-        source => "puppet:///instala-sun-java6/preseed.sun",
-	notify => Exec["sun-java6"],
-        }
-
-        exec { "sun-java6":
-	path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-        command => "mount /proc -t proc /proc; debconf-set-selections < /var/log/preseed.sun ; apt-get update ; apt-get install -y --force-yes sun-java6-bin sun-java6-jre sun-java6-plugin sun-java6-fonts; umount /proc",
-        require => File["/var/log/preseed.sun"],
-        unless => "dpkg -l | grep sun-java6-jre | grep 6-26-0lenny1 | grep ii",
-	notify => Exec["nuevos_enlaces-java"]
-	}
-
-        exec { "nuevos_enlaces-java":
-	path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-        command => "update-java-alternatives -s /usr/lib/jvm/java-6-sun",
-	refreshonly => true,
-	}
-
-        file { "/opt/ltsp/i386/var/log/preseed.sun":
-        owner => root, group => root, mode => 644,
-        source => "puppet:///instala-sun-java6/preseed.sun",
-	notify => Exec["sun-java6-thinclient"];
-        }
-
-        exec { "sun-java6-thinclient":
-	path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-        command => "chroot /opt/ltsp/i386 mount /proc -t proc /proc; chroot /opt/ltsp/i386 debconf-set-selections < /var/log/preseed.sun ; chroot /opt/ltsp/i386 apt-get update ; chroot /opt/ltsp/i386 apt-get install -y --force-yes sun-java6-bin sun-java6-jre sun-java6-plugin sun-java6-fonts; chroot /opt/ltsp/i386 umount /proc",
-        require => File["/opt/ltsp/i386/var/log/preseed.sun"],
-        unless => "chroot /opt/ltsp/i386 dpkg -l | grep sun-java6-jre | grep 6-26-0lenny1 | grep ii",
-	notify => Exec["nuevos_enlaces-java-thinclient"];
-	}
-
-        exec { "nuevos_enlaces-java-thinclient":
-	path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-        command => "chroot /opt/ltsp/i386 update-java-alternatives -s /usr/lib/jvm/java-6-sun",
-	refreshonly => true,
-	notify => Exec[crear-imagen-sun-java6];
-	}
-
-	exec { "crear-imagen-sun-java6":
-	path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-        command => "ltsp-update-image --arch i386",
-        refreshonly => true;
-       }
-
-}
Index: tareas_puppet/servidores_aula/actualiza-flashplugin.tgz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: tareas_puppet/servidores_aula/actualiza-flashplugin.tgz
___________________________________________________________________
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
