Merge remote-tracking branch 'remotes/laercio/master'

Atualizando fork com modificações feitas pelo Laércio.

Signed-off-by: Juliano Creppo Mendieta <julianomendieta@gmail.com>

README.md

@@ -16,17 +16,17 @@
 ### Observações
 
 * É possível que esta solução se aplique também aos computadores do pregão 23/2012, mas nós não tivemos ainda a oportunidade de testá-la, pois não temos equipamentos deste pregão em nenhuma escola municipal de Mogi das Cruzes.
-* Esta solução pode aplicar-se a outros progões do ProInfo Rural, **desde que a placa de vídeo original ATI Rage XL Quad seja substituída por um par de placas TN-502 Dual ou uma placa TN-502 Quad**.
+* Esta solução pode aplicar-se a outros pregões do ProInfo Rural, **desde que a placa de vídeo original ATI Rage XL Quad seja substituída por um par de placas TN-502 Dual ou uma placa TN-502 Quad**.
 
 ## Sabores do Ubuntu recomendados para os computadores do ProInfo
 
 Os sabores e arquiteturas do Ubuntu que nós recomendamos para os computadores do ProInfo são os seguintes:
 
-| Tipo de computador                            | Sabor do Ubuntu    | arquitetura |
-|:---------------------------------------------:|:------------------:|:-----------:|
-| multiterminal com menos de 2GB de memória RAM | Xubuntu ou Lubuntu | 32 bits     |
-| multiterminal com 2GB de memória RAM ou mais  | Xubuntu            | 64 bits     |
-| servidor                                      | Ubuntu MATE        | 64 bits     |
+| Tipo de computador                            | Sabor do Ubuntu                                                                                                                                                                                             | Arquitetura |
+|:---------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:-----------:|
+| multiterminal com menos de 2GB de memória RAM | [Xubuntu](http://cdimage.ubuntu.com/xubuntu/releases/xenial/release/xubuntu-16.04-desktop-i386.iso) ou [Lubuntu](http://cdimage.ubuntu.com/lubuntu/releases/16.04/release/lubuntu-16.04-desktop-i386.iso)   | 32 bits     |
+| multiterminal com 2GB de memória RAM ou mais  | [Xubuntu](http://cdimage.ubuntu.com/xubuntu/releases/xenial/release/xubuntu-16.04-desktop-amd64.iso) ou [Lubuntu](http://cdimage.ubuntu.com/lubuntu/releases/16.04/release/lubuntu-16.04-desktop-amd64.iso) | 64 bits     |
+| servidor                                      | [Ubuntu MATE](http://cdimage.ubuntu.com/ubuntu-mate/releases/xenial/release/ubuntu-mate-16.04-desktop-amd64.iso)                                                                                            | 64 bits     |
 
 ## Resumo do roteiro
 

autostart-disable-nm/nm-applet.desktop

+[Desktop Entry]
+Hidden=true

autostart-disable/blueman.desktop

+[Desktop Entry]
+Hidden=true

autostart-disable/light-locker.desktop

+[Desktop Entry]
+Hidden=true

autostart-disable/print-applet.desktop

+[Desktop Entry]
+Hidden=true

autostart-disable/update-notifier.desktop

+[Desktop Entry]
+Hidden=true

autostart-disable/xfce4-power-manager.desktop

+[Desktop Entry]
+Hidden=true

autostart/wine.desktop

+[Desktop Entry]
+Type=Application
+Name=WINE desktop startup
+TryExec=wine
+Exec=wine explorer.exe /desktop

configurar-epoptes-client.sh

+#!/bin/bash
+install -m 644 systemd/epoptes-client.service /etc/systemd/system
+systemctl stop epoptes-client
+systemctl disable epoptes-client
+systemctl enable epoptes-client.service
+systemctl start epoptes-client.service

configurar-multiterminal-xephyr.sh

+#!/bin/bash
+
+install -m 644 systemd/xorg-daemon.s* /etc/systemd/system
+install -m 644 udev/* /etc/udev/rules.d
+
+install -d /etc/X11/xorg.conf.d
+install -m 644 xorg/9[78]*.conf /etc/X11/xorg.conf.d
+install -m 755 seat-attach-assistant /usr/local/bin
+install -m 755 update-xorg-conf /usr/local/bin
+install -m 755 xorg-daemon /usr/local/bin
+install -m 755 xephyr-wrapper /usr/local/bin
+
+install -d /etc/xdg/lightdm/lightdm.conf.d
+install -m 644 lightdm/*.conf /etc/xdg/lightdm/lightdm.conf.d
+
+update-xorg-conf SM501 /etc/X11/xorg.conf.d/98-proinfo-*.conf
+systemctl enable xorg-daemon.socket
+systemctl start xorg-daemon.socket
+
+apt-add-repository ppa:ubuntu-multiseat/xephyr
+apt update
+apt -y upgrade
+apt -y install xserver-xorg-video-siliconmotion xserver-xephyr compton numlockx
+
+udevadm trigger
+systemctl restart lightdm

configurar-multiterminal-xf86-video-nested.sh

+#!/bin/bash
+
+install -m 644 systemd/xorg-daemon.s* /etc/systemd/system
+install -m 644 udev/* /etc/udev/rules.d
+
+install -d /etc/X11/xorg.conf.d
+install -m 644 xorg/*.conf /etc/X11/xorg.conf.d
+install -m 755 seat-attach-assistant /usr/local/bin
+install -m 755 update-xorg-conf /usr/local/bin
+install -m 755 xorg-daemon /usr/local/bin
+
+install -d /etc/xdg/lightdm/lightdm.conf.d
+install -m 644 lightdm/9[5679]*.conf /etc/xdg/lightdm/lightdm.conf.d
+
+update-xorg-conf SM501 /etc/X11/xorg.conf.d/98-proinfo-*.conf
+systemctl enable xorg-daemon.socket
+systemctl start xorg-daemon.socket
+
+apt-add-repository ppa:ubuntu-multiseat/xf86-video-nested
+apt update
+apt -y upgrade
+apt -y install xserver-xorg-video-siliconmotion xserver-xorg-video-nested compton numlockx
+
+udevadm trigger
+systemctl restart lightdm

configurar-wine.sh

+#!/bin/bash
+install -m 644 autostart/wine.desktop /etc/xdg/autostart

contornar-bug-tela-listrada.sh

@@ -44,7 +44,12 @@ echo "       Índice correspondente no menu do GRUB: ${indice}."
 
 install -m 644 systemd/le-nextboot-* /etc/systemd/system
 
-systemctl enable le-nextboot-poweroff@${indice}
+cat > /etc/le-nextboot.conf << EOF
+LE_NEXTBOOT_ENABLE=true
+LE_NEXTBOOT_INDEX=${indice}
+EOF
+
+systemctl enable le-nextboot-poweroff.service
 grub-reboot ${indice}
 
 mount ${particao} /mnt

criar-usuarios-alunos-lubuntu.sh

+#!/bin/bash
+
+addgroup freeze
+adduser --gecos "Modelo para Freeze" --shell /bin/bash freezetemplate
+
+for i in 0 1 2 3 4
+do
+    adduser --disabled-login --gecos "Aluno #${i}" --shell /bin/bash aluno${i}
+    adduser aluno${i} freeze
+    echo aluno${i}:aluno${i} | chpasswd
+done
+
+apt update
+apt -y install libpam-mount bindfs
+
+install -d /etc/xdg/lightdm/lightdm.conf.d
+install -m 644 lightdm/96-disable-guest.conf /etc/xdg/lightdm/lightdm.conf.d
+install -m 755 mount-wrapper /usr/local/sbin
+install -m 755 prepare-clonezilla /usr/local/sbin
+install -m 644 pam_mount.conf.xml /etc/security
+install -m 644 lubuntu/*.policy /usr/share/polkit-1/actions
+
+install -d /usr/local/share/file-manager/actions
+install -m 644 lubuntu/*.desktop /usr/local/share/file-manager/actions
+install -m 755 lubuntu/*-pkexec /usr/local/bin
+
+install -m 755 freeze-session-auto /usr/local/bin
+install -d /home/freezetemplate/.config/autostart
+install -m 644 autostart/freeze-session-auto.desktop /home/freezetemplate/.config/autostart
+install -m 644 autostart-disable/*.desktop /home/freezetemplate/.config/autostart
+
+mkdir -m 0777 /var/freeze-data
+ln -s /var/freeze-data "/home/freezetemplate/SALVAR AQUI!"
+
+chown -R freezetemplate:freezetemplate /home/freezetemplate

criar-usuarios-alunos-xubuntu.sh

+#!/bin/bash
+
+addgroup freeze
+adduser --gecos "Modelo para Freeze" --shell /bin/bash freezetemplate
+
+for i in 0 1 2 3 4
+do
+    adduser --disabled-login --gecos "Aluno #${i}" --shell /bin/bash aluno${i}
+    adduser aluno${i} freeze
+    echo aluno${i}:aluno${i} | chpasswd
+done
+
+apt update
+apt -y install libpam-mount bindfs
+
+install -d /etc/xdg/lightdm/lightdm.conf.d
+install -m 644 lightdm/96-disable-guest.conf /etc/xdg/lightdm/lightdm.conf.d
+install -m 755 mount-wrapper /usr/local/sbin
+install -m 755 prepare-clonezilla /usr/local/sbin
+install -m 644 pam_mount.conf.xml /etc/security
+install -m 644 xubuntu/*.policy /usr/share/polkit-1/actions
+
+install -m 755 freeze-session-auto /usr/local/bin
+install -d /home/freezetemplate/.config/autostart
+install -m 644 autostart/freeze-session-auto.desktop /home/freezetemplate/.config/autostart
+install -m 644 autostart-disable/*.desktop /home/freezetemplate/.config/autostart
+
+install -d /home/freezetemplate/.config/Thunar
+install -m 644 xubuntu/uca.xml /home/freezetemplate/.config/Thunar
+
+mkdir -m 0777 /var/freeze-data
+ln -s /var/freeze-data "/home/freezetemplate/SALVAR AQUI!"
+
+chown -R freezetemplate:freezetemplate /home/freezetemplate

instalar-pacotes-recomendados.sh

+#!/bin/bash
+
+PACOTES="
+ubuntu-edu-preschool
+ubuntu-edu-primary
+ubuntu-edu-secondary
+kde-l10n-ptbr
+gparted
+pinta
+vlc
+ktouch
+openshot
+dreamchess
+gnome-chess
+supertux
+supertuxkart
+pingus
+chromium-browser
+adobe-flashplugin
+ssvnc
+epoptes-client
+ssh
+nginx-light
+wine
+"
+
+apt-add-repository ppa:oiteam/epoptes
+apt update
+
+OMNITUX="http://downloads.sourceforge.net/project/omnitux/omnitux/v1.2.1/omnitux_1.2.1_all.deb?r=http%3A%2F%2Fomnitux.sourceforge.net%2Fdownload.en.php&ts=1462984447&use_mirror=liquidtelecom"
+wget -c $OMNITUX -O /tmp/omnitux_1.2.1_all.deb && apt install /tmp/omnitux_1.2.1_all.deb
+
+apt install $PACOTES
+
+install -m 644 tuxpaint.conf /etc/tuxpaint

lightdm/98-xephyr-multi-seat.conf

 [Seat:seat-V0]
-xserver-command=env DISPLAY=:90.0 Xephyr -dpi 96 -xkb-rules evdev -xkb-layout br -xkb-model abnt2 -output VGA
+xserver-command=xephyr-wrapper :90.0 -output VGA
 
 [Seat:seat-L0]
-xserver-command=env DISPLAY=:90.0 Xephyr -dpi 96 -xkb-rules evdev -xkb-layout br -xkb-model abnt2 -output LVDS
+xserver-command=xephyr-wrapper :90.0 -output LVDS
 
 [Seat:seat-V1]
-xserver-command=env DISPLAY=:90.1 Xephyr -dpi 96 -xkb-rules evdev -xkb-layout br -xkb-model abnt2 -output VGA
+xserver-command=xephyr-wrapper :90.1 -output VGA
 
 [Seat:seat-L1]
-xserver-command=env DISPLAY=:90.1 Xephyr -dpi 96 -xkb-rules evdev -xkb-layout br -xkb-model abnt2 -output LVDS
+xserver-command=xephyr-wrapper :90.1 -output LVDS

lubuntu/leafpad-pkexec

+#!/bin/sh
+pkexec "/usr/bin/leafpad" "$@"

lubuntu/lxterminal-pkexec

+#!/bin/sh
+pkexec "/usr/bin/lxterminal" "$@"

lubuntu/open-as-root.desktop

+[Desktop Entry]
+Type=Action
+Profiles=profile-folder;profile-non-plain-text;profile-plain-text;
+Name[pt_BR]=Abrir como administrador
+Name[en_US]=Open As Root
+Name[en]=Open As Root
+Name[C]=Open As Root
+Tooltip[pt_BR]=Abrir com privilégios administrativos
+Tooltip[en_US]=Open As Root
+Tooltip[en]=Open As Root
+Tooltip[C]=Open As Root
+ToolbarLabel[pt_BR]=Abrir como administrador
+ToolbarLabel[en_US]=Open As Root
+ToolbarLabel[en]=Open As Root
+ToolbarLabel[C]=Open As Root
+
+Icon=gtk-dialog-authentication
+
+[X-Action-Profile profile-folder]
+MimeTypes=inode/directory;
+Exec=pcmanfm-pkexec %u
+Name[pt_BR]=Abrir pasta como administrador
+Name[en_US]=Open Folder As Root
+Name[en]=Open Folder As Root
+Name[C]=Open Folder As Root
+
+[X-Action-Profile profile-non-plain-text]
+MimeTypes=all/allfiles;!text/plain;
+Exec=pcmanfm-pxexec %d
+Name[pt_BR]=Abrir como administrador
+Name[en_US]=Open Folder As Root
+Name[en]=Open Folder As Root
+Name[C]=Open Folder As Root
+
+[X-Action-Profile profile-plain-text]
+MimeTypes=text/plain;
+Exec=leafpad-pkexec %f
+Name[pt_BR]=Editar arquivo como administrador
+Name[en_US]=Edit File As Root
+Name[en]=Edit File As Root
+Name[C]=Edit File As Root