From 1f0e9c5057d2ca98056d7feaa5a56d7d16380084 Mon Sep 17 00:00:00 2001
From: Guilherme Cantoni <guilherme.cantoni@planejamento.gov.br>
Date: Thu, 19 Mar 2015 13:15:56 -0300
Subject: [PATCH] Correção do problema de lock durante provisionamento do ambiente

---
 Vagrantfile                       | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------
 Vagrantfile.conf.example          |   2 +-
 jod/Dockerfile                    |   3 ++-
 jod/jodconverter-tomcat-2.2.2.zip | Bin 0 -> 8250778 bytes
 jod/run.sh                        |   5 +++--
 sei/Dockerfile                    |  10 +++++-----
 sei/run.sh                        |   9 ++++++---
 solr/Dockerfile                   |  34 +++++++++++++++-------------------
 solr/apache-solr-4.0.0.tgz        | Bin 0 -> 107656960 bytes
 solr/jetty                        |   3 +++
 solr/jetty.sh                     | 605 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 11 files changed, 754 insertions(+), 141 deletions(-)
 create mode 100644 jod/jodconverter-tomcat-2.2.2.zip
 create mode 100644 solr/apache-solr-4.0.0.tgz
 create mode 100644 solr/jetty
 create mode 100644 solr/jetty.sh

diff --git a/Vagrantfile b/Vagrantfile
index 26ae59a..bf60e01 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,110 +1,114 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-require "yaml"
- 
-# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
-
-# Parâmetros de customização do ambiente de desenvolvimento
-params = if File.exists?("Vagrantfile.conf") then YAML::load_file("Vagrantfile.conf") else {} end
-params_source_dir = params["source_dir"] || "../sei"
-params_script_sei = params["script_sei"] || "../sei-db-ref-executivo/sei_2_5_2_BD_Ref_Exec.sql"
-params_script_sip = params["script_sip"] || "../sei-db-ref-executivo/sip_2_5_2_BD_Ref_Exec.sql"
-params_memoria_vm = params["memoria_vm"] || "2048"
-params_repo_arquivos = params["repositorio_arquivos"] || "../sei-arquivos"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
-
-  # Atribuição do hostname da máquina virtual 
-  config.vm.hostname = "sei-vagrant"
-
-  # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "guilhermeadc/centos65"
-  config.vm.box_download_checksum = "76a2a61de2d89f6cfd4d795e57cc4406"
-  config.vm.box_download_checksum_type = "md5"
-
-  # Disable automatic box update checking. If you disable this, then
-  # boxes will only be checked for updates when the user runs
-  # `vagrant box outdated`. This is not recommended.
-  config.vm.box_check_update = true
-
-  # Configuração do redirecionamento entre Máquina Virtual e Host
-  # Necessário permissões de root para utilizar a porta 80 (> 1024)
-  config.vm.network :forwarded_port, guest: 80, host: 80      # SIP e SEI (Apache)
-  config.vm.network :forwarded_port, guest: 3306, host: 3306  # Banco de Dados (Mysql)
-  config.vm.network :forwarded_port, guest: 8080,  host: 8080 # Jod Converter (Tomcat)
-  config.vm.network :forwarded_port, guest: 8983,  host: 8983 # Solr Indexer (Jetty)
-
-  # Diretórios compartilhados com a durante a execução
-  config.vm.synced_folder ".", "/mnt/sei/ops" 
-  config.vm.synced_folder params_source_dir, "/mnt/sei/src", mount_options: ["dmode=777", "fmode=777"]
-  config.vm.synced_folder params_repo_arquivos, "/mnt/sei/arquivos", create: true, mount_options: ["dmode=777", "fmode=777"]
-  config.vm.synced_folder File.dirname(params_script_sei), "/mnt/sei/db_sei" 
-  config.vm.synced_folder File.dirname(params_script_sip), "/mnt/sei/db_sip" 
-
-  # Provider-specific configuration so you can fine-tune various
-  # backing providers for Vagrant. These expose provider-specific options.
-  config.vm.provider "virtualbox" do |vb|
-    # Don't boot with headless mode
-    # vb.gui = true
-    # Use VBoxManage to customize the VM. For example to change memory:
-    vb.customize ["modifyvm", :id, "--memory", params_memoria_vm, "--usb", "off", "--audio", "none"]
-  end
-
-  $script_banco_dados = <<SCRIPT
-    mkdir -p /mnt/sei/ops/mysql/.tmp/
-    cp /mnt/sei/db_sei/$1 /mnt/sei/ops/mysql/.tmp/sei_mysql.sql
-    cp /mnt/sei/db_sip/$2 /mnt/sei/ops/mysql/.tmp/sip_mysql.sql
-    cp /mnt/sei/ops/sei/ConfiguracaoSEI.php /mnt/sei/src/sei/ConfiguracaoSEI.php
-    cp /mnt/sei/ops/sei/ConfiguracaoSip.php /mnt/sei/src/sip/ConfiguracaoSip.php
-SCRIPT
-
-  config.vm.provision "shell", 
-    inline: $script_banco_dados, 
-    args: [File.basename(params_script_sei), File.basename(params_script_sip)]
-
-  # Provisionamento da Máquina Virtual responsável por manter os containers do Docker
-  config.vm.provision "docker" do |docker|    
-    
-    # Constrói imagens dos containers utilizados no provicionamento
-    docker.build_image "/mnt/sei/ops/mysql", args: "-t 'sei.gov/mysql'"
-    docker.build_image "/mnt/sei/ops/sei", args: "-t 'sei.gov/sei'"
-    docker.build_image "/mnt/sei/ops/solr", args: "-t 'sei.gov/solr'"
-    docker.build_image "/mnt/sei/ops/jod", args: "-t 'sei.gov/jod'"
-
-    # Provisiona docker containers na máquina virtual
-    # docker run -it --name sei_data -v /mnt/sei/arquivos:/var/sei/arquivos centos:centos6 true
-    docker.run "sei_data", image: "centos:centos6", 
-      args: "-v /mnt/sei/arquivos:/var/sei/arquivos",
-      cmd: "true"
-
-    # docker run -it --name sei_db -p 3306:3306 --rm  sei.gov/mysql:latest
-    docker.run "sei_db",  image: "sei.gov/mysql:latest", 
-      daemonize: true, 
-      args: "-p 3306:3306"
-
-    # docker run -it --name sei_solr -p 8983:8983 --rm -v /mnt/sei/src/sei/solr:/mnt/sei/index sei.gov/solr:latest
-    docker.run "sei_solr", image: "sei.gov/solr:latest",
-      daemonize: true, 
-      args: "-p 8983:8983 -v /mnt/sei/src/sei/solr:/mnt/sei/index"
-
-    # docker run -it --name sei_jod -p 8080:8080 --rm sei.gov/jod:latest
-    docker.run "sei_jod", image: "sei.gov/jod:latest",
-      daemonize: true, 
-      args: "-p 8080:8080"
-
-    # docker run -it --name sei_www -p 80:80 --rm --link sei_solr:solr --link sei_db:db --link sei_jod:jod -v /mnt/sei/src:/var/www/html -v /mnt/sei/ops/sei:/mnt/sei/ops/sei --volumes-from sei_data sei.gov/sei:latest
-    docker.run "sei_www", image: "sei.gov/sei:latest", 
-      daemonize: true, 
-      args: "-p 80:80 --link sei_db:db --link sei_solr:solr --link sei_jod:jod -v /mnt/sei/src:/var/www/html -v /mnt/sei/ops/sei:/mnt/sei/ops/sei --volumes-from sei_data"
-  end
-
-  # Limpeza de arquivos temporários criados durante o provisionamento do sistema
-  config.vm.provision "shell", inline: "rm -rf /mnt/sei/ops/mysql/.tmp"
-
-  # Inicialização dos containers em caso de reinicialização da máquina host
-  config.vm.provision "shell", run: "always", inline: "docker start sei_data sei_db sei_solr sei_jod sei_www"
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+require "yaml"
+ 
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+# Parâmetros de customização do ambiente de desenvolvimento
+params = if File.exists?("Vagrantfile.conf") then YAML::load_file("Vagrantfile.conf") else {} end
+params_source_dir = params["source_dir"] || "../sei"
+params_script_sei = params["script_sei"] || "../sei-db-ref-executivo/sei_2_5_2_BD_Ref_Exec.sql"
+params_script_sip = params["script_sip"] || "../sei-db-ref-executivo/sip_2_5_2_BD_Ref_Exec.sql"
+params_memoria_vm = params["memoria_vm"] || "1024"
+params_repo_arquivos = params["repositorio_arquivos"] || "../sei-arquivos"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  # Atribuição do hostname da máquina virtual 
+  config.vm.hostname = "sei-vagrant"
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  # config.vm.box = "guilhermeadc/centos65"
+  # config.vm.box_download_checksum = "76a2a61de2d89f6cfd4d795e57cc4406"
+  # config.vm.box_download_checksum_type = "md5"
+  config.vm.box = "chef/centos-7.0"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  config.vm.box_check_update = true
+
+  # Configuração do redirecionamento entre Máquina Virtual e Host
+  # Necessário permissões de root para utilizar a porta 80 (> 1024)
+  config.vm.network :forwarded_port, guest: 80,   host: 80   # SIP e SEI (Apache)
+  config.vm.network :forwarded_port, guest: 3306, host: 3306 # Banco de Dados (Mysql)
+  config.vm.network :forwarded_port, guest: 8080, host: 8080 # Jod Converter (Tomcat)
+  config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr Indexer (Jetty)
+
+  # Diretórios compartilhados com a durante a execução
+  config.vm.synced_folder ".", "/mnt/sei/ops" 
+  config.vm.synced_folder params_source_dir, "/mnt/sei/src", mount_options: ["dmode=777", "fmode=777"]
+  config.vm.synced_folder params_repo_arquivos, "/mnt/sei/arquivos", create: true, mount_options: ["dmode=777", "fmode=777"]
+  config.vm.synced_folder File.dirname(params_script_sei), "/mnt/sei/db_sei" 
+  config.vm.synced_folder File.dirname(params_script_sip), "/mnt/sei/db_sip" 
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  config.vm.provider "virtualbox" do |vb|
+    # Don't boot with headless mode
+    # vb.gui = true
+    # Use VBoxManage to customize the VM. For example to change memory:
+    vb.customize ["modifyvm", :id, "--memory", params_memoria_vm, "--usb", "off", "--audio", "none"]
+  end
+
+  $script_banco_dados = <<SCRIPT
+    mkdir -p /mnt/sei/ops/mysql/.tmp/
+    cp /mnt/sei/db_sei/$1 /mnt/sei/ops/mysql/.tmp/sei_mysql.sql
+    cp /mnt/sei/db_sip/$2 /mnt/sei/ops/mysql/.tmp/sip_mysql.sql
+    cp /mnt/sei/ops/sei/ConfiguracaoSEI.php /mnt/sei/src/sei/ConfiguracaoSEI.php
+    cp /mnt/sei/ops/sei/ConfiguracaoSip.php /mnt/sei/src/sip/ConfiguracaoSip.php
+SCRIPT
+
+# Atualização da VM de host do docker
+  config.vm.provision "shell", run: "always", inline: "yum -y update && yum -y upgrade"
+
+  config.vm.provision "shell", 
+    inline: $script_banco_dados, 
+    args: [File.basename(params_script_sei), File.basename(params_script_sip)]
+
+  # Provisionamento da Máquina Virtual responsável por manter os containers do Docker
+  config.vm.provision "docker" do |docker|    
+    
+    # Constrói imagens dos containers utilizados no provicionamento
+    docker.build_image "/mnt/sei/ops/solr",  args: "-t 'processoeletronico/solr'"
+    docker.build_image "/mnt/sei/ops/mysql", args: "-t 'processoeletronico/mysql'"
+    docker.build_image "/mnt/sei/ops/sei",   args: "-t 'processoeletronico/sei'"
+    docker.build_image "/mnt/sei/ops/jod",   args: "-t 'processoeletronico/jod'"
+
+    # Provisiona docker containers na máquina virtual
+    # docker run -it --name sei_data -v /mnt/sei/arquivos:/var/sei/arquivos centos:centos6 true
+    docker.run "sei_data", image: "centos:centos6", 
+      args: "-v /mnt/sei/arquivos:/var/sei/arquivos",
+      cmd: "true"
+
+    # docker run -it --name sei_db -p 3306:3306 --rm  processoeletronico/mysql:latest
+    docker.run "sei_db",  image: "processoeletronico/mysql:latest", 
+      daemonize: true, 
+      args: "-p 3306:3306"
+
+    # docker run -it --name sei_solr -p 8983:8983 --rm -v /mnt/sei/src/sei/solr:/mnt/sei/index processoeletronico/solr:latest
+    docker.run "sei_solr", image: "processoeletronico/solr:latest",
+      daemonize: true, 
+      args: "-p 8983:8983 -v /mnt/sei/src/sei/solr:/mnt/sei/index"
+
+    # docker run -it --name sei_jod -p 8080:8080 --rm processoeletronico/jod:latest
+    docker.run "sei_jod", image: "processoeletronico/jod:latest",
+      daemonize: true, 
+      args: "-p 8080:8080"
+
+    # docker run -it --name sei_www -p 80:80 --rm --link sei_solr:solr --link sei_db:db --link sei_jod:jod -v /mnt/sei/src:/var/www/html -v /mnt/sei/ops/sei:/mnt/sei/ops/sei --volumes-from sei_data processoeletronico/sei:latest
+    docker.run "sei_www", image: "processoeletronico/sei:latest", 
+      daemonize: true, 
+      args: "-p 80:80 --link sei_db:db --link sei_solr:solr --link sei_jod:jod -v /mnt/sei/src:/var/www/html -v /mnt/sei/ops/sei:/mnt/sei/ops/sei --volumes-from sei_data"
+  end
+
+  # Limpeza de arquivos temporários criados durante o provisionamento do sistema
+  config.vm.provision "shell", inline: "rm -rf /mnt/sei/ops/mysql/.tmp"
+
+  # Inicialização dos containers em caso de reinicialização da máquina host
+  config.vm.provision "shell", run: "always", inline: "docker start sei_db sei_solr sei_jod sei_www"
+end
\ No newline at end of file
diff --git a/Vagrantfile.conf.example b/Vagrantfile.conf.example
index decb442..cff1843 100644
--- a/Vagrantfile.conf.example
+++ b/Vagrantfile.conf.example
@@ -13,4 +13,4 @@ script_sip: "../sei-db-ref-executivo/sip_2_5_2_BD_Ref_Exec.sql"
 repositorio_arquivos: "../sei-arquivos"
 
 # Quantidade de memória utilizada pela VM do VirtualBox (em Megabytes)
-memoria_vm: "2048"
+memoria_vm: "1024"
diff --git a/jod/Dockerfile b/jod/Dockerfile
index 08680ba..79e563b 100644
--- a/jod/Dockerfile
+++ b/jod/Dockerfile
@@ -27,7 +27,8 @@ RUN yum -y update libreoffice libreoffice-headless && \
     yum install -y libreoffice libreoffice-headless
 
 # Instalação da api de serviços de conversão de documentos
-RUN wget -q -O /opt/jodconverter-tomcat-2.2.2.zip http://sourceforge.net/projects/jodconverter/files/JODConverter/2.2.2/jodconverter-tomcat-2.2.2.zip/download
+ADD jodconverter-tomcat-2.2.2.zip /opt/
+# RUN wget -q -O /opt/jodconverter-tomcat-2.2.2.zip http://sourceforge.net/projects/jodconverter/files/JODConverter/2.2.2/jodconverter-tomcat-2.2.2.zip/download
 RUN unzip /opt/jodconverter-tomcat-2.2.2.zip -d /opt && rm /opt/jodconverter-tomcat-2.2.2.zip
 
 # Script de inicialização dos serviços
diff --git a/jod/jodconverter-tomcat-2.2.2.zip b/jod/jodconverter-tomcat-2.2.2.zip
new file mode 100644
index 0000000..aad2228
Binary files /dev/null and b/jod/jodconverter-tomcat-2.2.2.zip differ
diff --git a/jod/run.sh b/jod/run.sh
index ef745fd..d36e69c 100755
--- a/jod/run.sh
+++ b/jod/run.sh
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 SOFFICE_PATH=/usr/bin/soffice
 TOMCAT6_PATH=/opt/jodconverter-tomcat-2.2.2/bin/catalina.sh
 
@@ -6,4 +7,4 @@ echo "Iniciando o serviço LibreOffice headless"
 $SOFFICE_PATH --headless --nologo --nofirststartwizard --accept="socket,host=127.0.0.1,port=8100;urp" & > /dev/null 2>&1
 
 echo "Iniciando o serviço Tomcat 6"
-$TOMCAT6_PATH run
\ No newline at end of file
+$TOMCAT6_PATH run
diff --git a/sei/Dockerfile b/sei/Dockerfile
index d5e82e8..204108c 100644
--- a/sei/Dockerfile
+++ b/sei/Dockerfile
@@ -16,14 +16,14 @@ MAINTAINER PEN - Processo Eletrônico Nacional
 # Ref: http://sei.processoeletronico.gov.br/wiki/manual_de_instalacao#<SESSAO DE INSTALAÇÃO DO SEI e SIP>
 
 # Instalação do servidor web Apache 2.2, memcache e demais componentes
-RUN yum -y update httpd-2.2.* mysql-5.1.* memcached openssl wget curl unzip gcc java-1.7.0-openjdk libxml2 && \
+RUN yum -y update && \
     yum -y install httpd-2.2.* mysql-5.1.* memcached openssl wget curl unzip gcc java-1.7.0-openjdk libxml2
 
 # Configuração do charset do Apache
 RUN echo "AddDefaultCharset iso-8859-1" | tee -a /etc/httpd/conf/httpd.conf
 
 # Instalação do PHP 5 e demais bibliotecas
-RUN yum -y update php-* && \
+RUN yum -y update && \
     yum -y install php-5.3.* php-common php-cli php-pear php-bcmath php-gd php-gmp \
 	php-imap php-intl php-ldap php-mbstring php-mysql php-odbc php-pdo php-pecl-apc \
 	php-pspell php-zlib php-snmp php-soap php-xml php-xmlrpc php-zts php-devel \
@@ -34,8 +34,8 @@ RUN pecl install uploadprogress && \
     echo "extension=uploadprogress.so" >> /etc/php.d/uploadprogress.ini
 
 # Configuração dos parâmetros do SEI e SIP
-ADD ConfiguracaoSEI.php /var/www/html/sei/ConfiguracaoSEI.php
-ADD ConfiguracaoSip.php /var/www/html/sip/ConfiguracaoSip.php
+ADD ConfiguracaoSEI.php /opt/sei/ConfiguracaoSEI.php
+ADD ConfiguracaoSip.php /opt/sip/ConfiguracaoSip.php
 
 # Copia arquivos necessários para a instalação
 ADD sei.ini /etc/php.d/sei.ini
@@ -48,4 +48,4 @@ RUN chmod +x /run.sh
 EXPOSE 80
 
 # Inicialização dos serviços Apache e Memcache
-CMD ["/run.sh"]
+CMD ["/run.sh"]
\ No newline at end of file
diff --git a/sei/run.sh b/sei/run.sh
index fb4da55..816439b 100644
--- a/sei/run.sh
+++ b/sei/run.sh
@@ -1,15 +1,18 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 echo "127.0.0.1 sip_www" | tee -a /etc/hosts
 
 # Atribuição dos parâmetros de configuração do SEI
-cp /mnt/sei/ops/sei/ConfiguracaoSEI.php /var/www/html/sei/ConfiguracaoSEI.php
-cp /mnt/sei/ops/sip/ConfiguracaoSip.php /var/www/html/sip/ConfiguracaoSip.php
+cp /opt/sei/ConfiguracaoSEI.php /var/www/html/sei/ConfiguracaoSEI.php
+cp /opt/sip/ConfiguracaoSip.php /var/www/html/sip/ConfiguracaoSip.php
 
 # Criação do diretório padrão de upload de arquivos
 mkdir /var/www/html/sei/upload && chmod -R 666 /var/www/html/sei/upload
 mkdir /var/www/html/sip/upload && chmod -R 666 /var/www/html/sip/upload
 
+# Permissão de execução para utilitário de conversão de PDFs
+chmod +x /var/www/html/sei/ferramentas/wkhtmltopdf-amd64
+
 # Inicialização do serviço de cache
 /etc/init.d/memcached start 2>&1 > /dev/null
 
diff --git a/solr/Dockerfile b/solr/Dockerfile
index 5459d9b..a8a8dbe 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -15,22 +15,18 @@ MAINTAINER PEN - Processo Eletrônico Nacional
 # Instalação do MySQL seguindo as recomendações descritas na documentação do SEI
 # Ref: http://<WIKI DO PROJETO>#<SESSAO DE INSTALAÇÃO DO MYSQL>
 
-# Instalação do pacote Java JDK 
-RUN yum update -y java-1.7.0-openjdk && \ 
-    yum install -y java-1.7.0-openjdk
-
-# Instalação dos utilitários utilizados no provisionamento
-RUN yum install -y wget tar curl which
+# Instalação do pacote Java JDK e utilitários utilizados no provisionamento
+RUN yum update -y && \ 
+    yum install -y java-1.7.0-openjdk wget tar curl which
 
 # Criação de usuário de execução do serviço
 RUN useradd solr
 
 # Obtenção do pacote de instalação do Solr 4.0
-RUN wget -q -O /opt/solr-4.0.0.tgz http://archive.apache.org/dist/lucene/solr/4.0.0/apache-solr-4.0.0.tgz
+ADD apache-solr-4.0.0.tgz /opt/
 
 # Instalação do Apache Solr
-RUN tar xvz -C /opt -f /opt/solr-4.0.0.tgz && mv /opt/apache-solr-4.0.0 /opt/solr && \
-    chown -R solr:solr /opt/solr && rm /opt/solr-4.0.0.tgz
+RUN mv /opt/apache-solr-4.0.0 /opt/solr && chown -R solr:solr /opt/solr
 
 # Configuração dos parâmetros default
 RUN echo "JAVA_OPTIONS='-Dsolr.solr.home=/opt/solr/example/solr $JAVA_OPTIONS'" | tee -a /etc/default/jetty && \
@@ -74,18 +70,18 @@ RUN mkdir /var/opt/sei/sei-protocolos/conteudo && \
 
 # Configuração dos links a instalação do Solr e o índice Protocolo
 RUN ln -s /opt/solr/contrib/ /var/opt/sei/sei-protocolos/contrib && \
-	ln -s /opt/solr/dist/ /var/opt/sei/sei-protocolos/dist && \
-	ln -s /opt/solr/example/lib/ /var/opt/sei/sei-protocolos/lib
+    ln -s /opt/solr/dist/ /var/opt/sei/sei-protocolos/dist && \
+    ln -s /opt/solr/example/lib/ /var/opt/sei/sei-protocolos/lib
 
 # Configuração dos links a instalação do Solr e o índice Base de Conhecimento
 RUN ln -s /opt/solr/contrib/ /var/opt/sei/sei-bases-conhecimento/contrib && \
-	ln -s /opt/solr/dist/ /var/opt/sei/sei-bases-conhecimento/dist && \
-	ln -s /opt/solr/example/lib/ /var/opt/sei/sei-bases-conhecimento/lib
+    ln -s /opt/solr/dist/ /var/opt/sei/sei-bases-conhecimento/dist && \
+    ln -s /opt/solr/example/lib/ /var/opt/sei/sei-bases-conhecimento/lib
 
 # Configuração dos links a instalação do Solr e o índice Publicações
 RUN ln -s /opt/solr/contrib/ /var/opt/sei/sei-publicacoes/contrib && \
-	ln -s /opt/solr/dist/ /var/opt/sei/sei-publicacoes/dist && \
-	ln -s /opt/solr/example/lib/ /var/opt/sei/sei-publicacoes/lib
+    ln -s /opt/solr/dist/ /var/opt/sei/sei-publicacoes/dist && \
+    ln -s /opt/solr/example/lib/ /var/opt/sei/sei-publicacoes/lib
 
 # Configuração de log e permissões de pastas
 RUN mkdir /var/log/solr
@@ -93,15 +89,15 @@ RUN chown solr:solr -R /opt/solr /var/opt/sei /var/log/solr
 
 # Construção dos índices de protocolos do SEI
 RUN service solr start && sleep 20 && \
-	curl 'http://localhost:8983/solr/admin/cores?action=CREATE&name=sei-protocolos&instanceDir=/var/opt/sei/sei-protocolos&config=sei-protocolos-config.xml&schema=sei-protocolos-schema.xml&dataDir=/var/opt/sei/sei-protocolos/conteudo'
+    curl 'http://localhost:8983/solr/admin/cores?action=CREATE&name=sei-protocolos&instanceDir=/var/opt/sei/sei-protocolos&config=sei-protocolos-config.xml&schema=sei-protocolos-schema.xml&dataDir=/var/opt/sei/sei-protocolos/conteudo'
 
 # Construção dos índices da base de conhecimento do SEI
 RUN service solr start && sleep 20 && \    
-	curl 'http://localhost:8983/solr/admin/cores?action=CREATE&name=sei-bases-conhecimento&instanceDir=/var/opt/sei/sei-bases-conhecimento&config=sei-bases-conhecimento-config.xml&schema=sei-bases-conhecimento-schema.xml&dataDir=/var/opt/sei/sei-bases-conhecimento/conteudo'
+    curl 'http://localhost:8983/solr/admin/cores?action=CREATE&name=sei-bases-conhecimento&instanceDir=/var/opt/sei/sei-bases-conhecimento&config=sei-bases-conhecimento-config.xml&schema=sei-bases-conhecimento-schema.xml&dataDir=/var/opt/sei/sei-bases-conhecimento/conteudo'
 
 # Construção dos índices de publicações do SEI
 RUN service solr start && sleep 20 && \    
-	curl 'http://localhost:8983/solr/admin/cores?action=CREATE&name=sei-publicacoes&instanceDir=/var/opt/sei/sei-publicacoes&config=sei-publicacoes-config.xml&schema=sei-publicacoes-schema.xml&dataDir=/var/opt/sei/sei-publicacoes/conteudo'
+    curl 'http://localhost:8983/solr/admin/cores?action=CREATE&name=sei-publicacoes&instanceDir=/var/opt/sei/sei-publicacoes&config=sei-publicacoes-config.xml&schema=sei-publicacoes-schema.xml&dataDir=/var/opt/sei/sei-publicacoes/conteudo'
 
 # Construção dos índices de publicações do SEI
 RUN service solr start && sleep 20 && \ 
@@ -116,4 +112,4 @@ WORKDIR /opt/solr/example
 EXPOSE 8983
 
 # Inicialização dos serviços Apache e Memcache
-CMD ["java", "-jar", "start.jar"]
+CMD ["java", "-jar", "start.jar"]
\ No newline at end of file
diff --git a/solr/apache-solr-4.0.0.tgz b/solr/apache-solr-4.0.0.tgz
new file mode 100644
index 0000000..031deb2
Binary files /dev/null and b/solr/apache-solr-4.0.0.tgz differ
diff --git a/solr/jetty b/solr/jetty
new file mode 100644
index 0000000..866c52e
--- /dev/null
+++ b/solr/jetty
@@ -0,0 +1,3 @@
+JAVA_OPTIONS='-Dsolr.solr.home=/opt/apache-solr-4.0.0/example/solr $JAVA_OPTIONS'
+JETTY_HOME='/opt/apache-solr-4.0.0/example/'
+JETTY_USER=solr
\ No newline at end of file
diff --git a/solr/jetty.sh b/solr/jetty.sh
new file mode 100644
index 0000000..dcf70d3
--- /dev/null
+++ b/solr/jetty.sh
@@ -0,0 +1,605 @@
+#!/usr/bin/env bash  
+#
+# Startup script for jetty under *nix systems (it works under NT/cygwin too).
+
+# To get the service to restart correctly on reboot, uncomment below (3 lines):
+# ========================
+# chkconfig: 3 99 99
+# description: Jetty 7 webserver
+# processname: jetty
+# ========================
+
+# Configuration files
+#
+# /etc/default/jetty
+#   If it exists, this is read at the start of script. It may perform any 
+#   sequence of shell commands, like setting relevant environment variables.
+#
+# $HOME/.jettyrc
+#   If it exists, this is read at the start of script. It may perform any 
+#   sequence of shell commands, like setting relevant environment variables.
+#
+# /etc/jetty.conf
+#   If found, and no configurations were given on the command line,
+#   the file will be used as this script's configuration. 
+#   Each line in the file may contain:
+#     - A comment denoted by the pound (#) sign as first non-blank character.
+#     - The path to a regular file, which will be passed to jetty as a 
+#       config.xml file.
+#     - The path to a directory. Each *.xml file in the directory will be
+#       passed to jetty as a config.xml file.
+#
+#   The files will be checked for existence before being passed to jetty.
+#
+# $JETTY_HOME/etc/jetty.xml
+#   If found, used as this script's configuration file, but only if
+#   /etc/jetty.conf was not present. See above.
+#   
+# Configuration variables
+#
+# JAVA
+#   Command to invoke Java. If not set, java (from the PATH) will be used.
+#
+# JAVA_OPTIONS
+#   Extra options to pass to the JVM
+#
+# JETTY_HOME
+#   Where Jetty is installed. If not set, the script will try go
+#   guess it by first looking at the invocation path for the script,
+#   and then by looking in standard locations as $HOME/opt/jetty
+#   and /opt/jetty. The java system property "jetty.home" will be
+#   set to this value for use by configure.xml files, f.e.:
+#
+#    <Arg><Property name="jetty.home" default="."/>/webapps/jetty.war</Arg>
+#
+# JETTY_PORT
+#   Override the default port for Jetty servers. If not set then the
+#   default value in the xml configuration file will be used. The java
+#   system property "jetty.port" will be set to this value for use in
+#   configure.xml files. For example, the following idiom is widely
+#   used in the demo config files to respect this property in Listener
+#   configuration elements:
+#
+#    <Set name="Port"><Property name="jetty.port" default="8080"/></Set>
+#
+#   Note: that the config file could ignore this property simply by saying:
+#
+#    <Set name="Port">8080</Set>
+#
+# JETTY_RUN
+#   Where the jetty.pid file should be stored. It defaults to the
+#   first available of /var/run, /usr/var/run, JETTY_HOME and /tmp 
+#   if not set.
+#  
+# JETTY_PID
+#   The Jetty PID file, defaults to $JETTY_RUN/jetty.pid
+#   
+# JETTY_ARGS
+#   The default arguments to pass to jetty.
+#
+# JETTY_USER
+#   if set, then used as a username to run the server as
+#
+
+usage()
+{
+    echo "Usage: ${0##*/} [-d] {start|stop|run|restart|check|supervise} [ CONFIGS ... ] "
+    exit 1
+}
+
+[ $# -gt 0 ] || usage
+
+
+##################################################
+# Some utility functions
+##################################################
+findDirectory()
+{
+  local L OP=$1
+  shift
+  for L in "$@"; do
+    [ "$OP" "$L" ] || continue 
+    printf %s "$L"
+    break
+  done 
+}
+
+running()
+{
+  local PID=$(cat "$1" 2>/dev/null) || return 1
+  kill -0 "$PID" 2>/dev/null
+}
+
+started()
+{
+  # wait for 60s to see "STARTED" in PID file, needs jetty-started.xml as argument
+  for T in 1 2 3 4 5 6 7 9 10 11 12 13 14 15 
+  do
+    sleep 4
+    [ -z "$(grep STARTED $1 2>/dev/null)" ] || return 0
+    [ -z "$(grep STOPPED $1 2>/dev/null)" ] || return 1
+    [ -z "$(grep FAILED $1 2>/dev/null)" ] || return 1
+    local PID=$(cat "$2" 2>/dev/null) || return 1
+    kill -0 "$PID" 2>/dev/null || return 1
+    echo -n ". "
+  done
+
+  return 1;
+}
+
+
+readConfig()
+{
+  (( DEBUG )) && echo "Reading $1.."
+  source "$1"
+}
+
+
+
+##################################################
+# Get the action & configs
+##################################################
+CONFIGS=()
+NO_START=0
+DEBUG=0
+
+while [[ $1 = -* ]]; do
+  case $1 in
+    -d) DEBUG=1 ;;
+  esac
+  shift
+done
+ACTION=$1
+shift
+
+##################################################
+# Read any configuration files
+##################################################
+ETC=/etc
+if [ $UID != 0 ]
+then 
+  ETC=$HOME/etc
+fi
+
+for CONFIG in $ETC/default/jetty{,7} $HOME/.jettyrc; do
+  if [ -f "$CONFIG" ] ; then 
+    readConfig "$CONFIG"
+  fi
+done
+
+
+##################################################
+# Set tmp if not already set.
+##################################################
+TMPDIR=${TMPDIR:-/tmp}
+
+##################################################
+# Jetty's hallmark
+##################################################
+JETTY_INSTALL_TRACE_FILE="etc/jetty.xml"
+
+
+##################################################
+# Try to determine JETTY_HOME if not set
+##################################################
+if [ -z "$JETTY_HOME" ] 
+then
+  JETTY_SH=$0
+  case "$JETTY_SH" in
+    /*)   ;;
+    ./*)  ;;
+    *)    JETTY_SH=./$JETTY_SH ;;
+  esac
+  JETTY_HOME=${JETTY_SH%/*/*}
+
+  if [ ! -f "${JETTY_SH%/*/*}/$JETTY_INSTALL_TRACE_FILE" ]
+  then 
+    JETTY_HOME=
+  fi
+fi
+
+
+##################################################
+# if no JETTY_HOME, search likely locations.
+##################################################
+if [ -z "$JETTY_HOME" ] ; then
+  STANDARD_LOCATIONS=(
+        "/usr/share"
+        "/usr/share/java"
+        "${HOME}"
+        "${HOME}/src"
+        "${HOME}/opt"
+        "/opt"
+        "/java"
+        "/usr/local"
+        "/usr/local/share"
+        "/usr/local/share/java"
+        "/home"
+        )
+  JETTY_DIR_NAMES=(
+        "jetty-7"
+        "jetty7"
+        "jetty-7.*"
+        "jetty"
+        "Jetty-7"
+        "Jetty7"
+        "Jetty-7.*"
+        "Jetty"
+        )
+        
+  for L in "${STANDARD_LOCATIONS[@]}"
+  do
+    for N in "${JETTY_DIR_NAMES[@]}"
+    do
+      POSSIBLE_JETTY_HOME=("$L/"$N)
+      if [ ! -d "$POSSIBLE_JETTY_HOME" ]
+      then
+        # Not a directory. skip.
+        unset POSSIBLE_JETTY_HOME
+      elif [ ! -f "$POSSIBLE_JETTY_HOME/$JETTY_INSTALL_TRACE_FILE" ]
+      then
+        # Trace file not found. skip.
+        unset POSSIBLE_JETTY_HOME
+      else
+        # Good hit, Use it
+        JETTY_HOME=$POSSIBLE_JETTY_HOME
+        # Break out of JETTY_DIR_NAMES loop
+        break
+      fi
+    done
+    if [ -n "$POSSIBLE_JETTY_HOME" ]
+    then
+      # We have found our JETTY_HOME
+      # Break out of STANDARD_LOCATIONS loop
+      break
+    fi
+  done
+fi
+
+
+##################################################
+# No JETTY_HOME yet? We're out of luck!
+##################################################
+if [ -z "$JETTY_HOME" ]; then
+  echo "** ERROR: JETTY_HOME not set, you need to set it or install in a standard location" 
+  exit 1
+fi
+
+cd "$JETTY_HOME"
+JETTY_HOME=$PWD
+
+
+#####################################################
+# Check that jetty is where we think it is
+#####################################################
+if [ ! -r "$JETTY_HOME/$JETTY_INSTALL_TRACE_FILE" ] 
+then
+  echo "** ERROR: Oops! Jetty doesn't appear to be installed in $JETTY_HOME"
+  echo "** ERROR:  $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE is not readable!"
+  exit 1
+fi
+
+##################################################
+# Try to find this script's configuration file,
+# but only if no configurations were given on the
+# command line.
+##################################################
+if [ -z "$JETTY_CONF" ] 
+then
+  if [ -f $ETC/jetty.conf ]
+  then
+    JETTY_CONF=$ETC/jetty.conf
+  elif [ -f "$JETTY_HOME/etc/jetty.conf" ]
+  then
+    JETTY_CONF=$JETTY_HOME/etc/jetty.conf
+  fi
+fi
+
+##################################################
+# Get the list of config.xml files from jetty.conf
+##################################################
+if [ -z "$CONFIGS" ] && [ -f "$JETTY_CONF" ] && [ -r "$JETTY_CONF" ] 
+then
+  while read -r CONF
+  do
+    if expr "$CONF" : '#' >/dev/null ; then
+      continue
+    fi
+
+    if [ -d "$CONF" ] 
+    then
+      # assume it's a directory with configure.xml files
+      # for example: /etc/jetty.d/
+      # sort the files before adding them to the list of CONFIGS
+      for XMLFILE in "$CONF/"*.xml
+      do
+        if [ -r "$XMLFILE" ] && [ -f "$XMLFILE" ] 
+        then
+          CONFIGS+=("$XMLFILE")
+        else
+          echo "** WARNING: Cannot read '$XMLFILE' specified in '$JETTY_CONF'" 
+        fi
+      done
+    else
+      # assume it's a command line parameter (let start.jar deal with its validity)
+      CONFIGS+=("$CONF")
+    fi
+  done < "$JETTY_CONF"
+fi
+
+#####################################################
+# Find a location for the pid file
+#####################################################
+if [ -z "$JETTY_RUN" ] 
+then
+  JETTY_RUN=$(findDirectory -w /var/run /usr/var/run $JETTY_HOME /tmp)
+fi
+
+#####################################################
+# Find a pid and state file
+#####################################################
+if [ -z "$JETTY_PID" ] 
+then
+  JETTY_PID="$JETTY_RUN/jetty.pid"
+fi
+
+if [ -z "$JETTY_STATE" ] 
+then
+  JETTY_STATE=$JETTY_HOME/jetty.state
+fi
+JAVA_OPTIONS+=("-Djetty.state=$JETTY_STATE")
+rm -f $JETTY_STATE
+
+##################################################
+# Setup JAVA if unset
+##################################################
+if [ -z "$JAVA" ]
+then
+  JAVA=$(which java)
+fi
+
+if [ -z "$JAVA" ]
+then
+  echo "Cannot find a Java JDK. Please set either set JAVA or put java (>=1.5) in your PATH." 2>&2
+  exit 1
+fi
+
+#####################################################
+# See if JETTY_PORT is defined
+#####################################################
+if [ "$JETTY_PORT" ] 
+then
+  JAVA_OPTIONS+=("-Djetty.port=$JETTY_PORT")
+fi
+
+#####################################################
+# See if JETTY_LOGS is defined
+#####################################################
+if [ "$JETTY_LOGS" ]
+then
+  JAVA_OPTIONS+=("-Djetty.logs=$JETTY_LOGS")
+fi
+
+#####################################################
+# Are we running on Windows? Could be, with Cygwin/NT.
+#####################################################
+case "`uname`" in
+CYGWIN*) PATH_SEPARATOR=";";;
+*) PATH_SEPARATOR=":";;
+esac
+
+
+#####################################################
+# Add jetty properties to Java VM options.
+#####################################################
+JAVA_OPTIONS+=("-Djetty.home=$JETTY_HOME" "-Djava.io.tmpdir=$TMPDIR")
+
+[ -f "$JETTY_HOME/etc/start.config" ] && JAVA_OPTIONS=("-DSTART=$JETTY_HOME/etc/start.config" "${JAVA_OPTIONS[@]}")
+
+#####################################################
+# This is how the Jetty server will be started
+#####################################################
+
+JETTY_START=$JETTY_HOME/start.jar
+[ ! -f "$JETTY_START" ] && JETTY_START=$JETTY_HOME/lib/start.jar
+
+START_INI=$(dirname $JETTY_START)/start.ini
+[ -r "$START_INI" ] || START_INI=""
+
+RUN_ARGS=(${JAVA_OPTIONS[@]} -jar "$JETTY_START" $JETTY_ARGS "${CONFIGS[@]}")
+RUN_CMD=("$JAVA" ${RUN_ARGS[@]})
+
+#####################################################
+# Comment these out after you're happy with what 
+# the script is doing.
+#####################################################
+if (( DEBUG ))
+then
+  echo "JETTY_HOME     =  $JETTY_HOME"
+  echo "JETTY_CONF     =  $JETTY_CONF"
+  echo "JETTY_RUN      =  $JETTY_RUN"
+  echo "JETTY_PID      =  $JETTY_PID"
+  echo "JETTY_ARGS     =  $JETTY_ARGS"
+  echo "CONFIGS        =  ${CONFIGS[*]}"
+  echo "JAVA_OPTIONS   =  ${JAVA_OPTIONS[*]}"
+  echo "JAVA           =  $JAVA"
+  echo "RUN_CMD        =  ${RUN_CMD}"
+fi
+
+##################################################
+# Do the action
+##################################################
+case "$ACTION" in
+  start)
+    echo -n "Starting Jetty: "
+
+    if (( NO_START )); then 
+      echo "Not starting jetty - NO_START=1";
+      exit
+    fi
+
+    if [ $UID -eq 0 ] && type start-stop-daemon > /dev/null 2>&1 
+    then
+      unset CH_USER
+      if [ -n "$JETTY_USER" ]
+      then
+        CH_USER="-c$JETTY_USER"
+      fi
+
+      start-stop-daemon -S -p"$JETTY_PID" $CH_USER -d"$JETTY_HOME" -b -m -a "$JAVA" -- "${RUN_ARGS[@]}" --daemon
+
+    else
+
+      if [ -f "$JETTY_PID" ]
+      then
+        if running $JETTY_PID
+        then
+          echo "Already Running!"
+          exit 1
+        else
+          # dead pid file - remove
+          rm -f "$JETTY_PID"
+        fi
+      fi
+
+      if [ "$JETTY_USER" ] 
+      then
+        touch "$JETTY_PID"
+        chown "$JETTY_USER" "$JETTY_PID"
+        # FIXME: Broken solution: wordsplitting, pathname expansion, arbitrary command execution, etc.
+        su - "$JETTY_USER" -c "
+          exec ${RUN_CMD[*]} --daemon &
+          disown \$!
+          echo \$! > '$JETTY_PID'"
+      else
+        "${RUN_CMD[@]}" &
+        disown $!
+        echo $! > "$JETTY_PID"
+      fi
+
+    fi
+
+    if expr "${CONFIGS[*]}" : '.*etc/jetty-started.xml.*' >/dev/null
+    then
+      if started "$JETTY_STATE" "$JETTY_PID"
+      then
+        echo "OK `date`"
+      else
+        echo "FAILED `date`"
+      fi
+    else
+      echo "ok `date`"
+    fi
+
+    ;;
+
+  stop)
+    echo -n "Stopping Jetty: "
+    if [ $UID -eq 0 ] && type start-stop-daemon > /dev/null 2>&1; then
+      start-stop-daemon -K -p"$JETTY_PID" -d"$JETTY_HOME" -a "$JAVA" -s HUP
+      
+      TIMEOUT=30
+      while running "$JETTY_PID"; do
+        if (( TIMEOUT-- == 0 )); then
+          start-stop-daemon -K -p"$JETTY_PID" -d"$JETTY_HOME" -a "$JAVA" -s KILL
+        fi
+
+        sleep 1
+      done
+
+      rm -f "$JETTY_PID"
+      echo OK
+    else
+      PID=$(cat "$JETTY_PID" 2>/dev/null)
+      kill "$PID" 2>/dev/null
+      
+      TIMEOUT=30
+      while running $JETTY_PID; do
+        if (( TIMEOUT-- == 0 )); then
+          kill -KILL "$PID" 2>/dev/null
+        fi
+
+        sleep 1
+      done
+
+      rm -f "$JETTY_PID"
+      echo OK
+    fi
+
+    ;;
+
+  restart)
+    JETTY_SH=$0
+    if [ ! -f $JETTY_SH ]; then
+      if [ ! -f $JETTY_HOME/bin/jetty.sh ]; then
+        echo "$JETTY_HOME/bin/jetty.sh does not exist."
+        exit 1
+      fi
+      JETTY_SH=$JETTY_HOME/bin/jetty.sh
+    fi
+
+    "$JETTY_SH" stop "$@"
+    "$JETTY_SH" start "$@"
+
+    ;;
+
+  supervise)
+    #
+    # Under control of daemontools supervise monitor which
+    # handles restarts and shutdowns via the svc program.
+    #
+    exec "${RUN_CMD[@]}"
+
+    ;;
+
+  run|demo)
+    echo "Running Jetty: "
+
+    if [ -f "$JETTY_PID" ]
+    then
+      if running "$JETTY_PID"
+      then
+        echo "Already Running!"
+        exit 1
+      else
+        # dead pid file - remove
+        rm -f "$JETTY_PID"
+      fi
+    fi
+
+    exec "${RUN_CMD[@]}"
+
+    ;;
+
+  check|status)
+    echo "Checking arguments to Jetty: "
+    echo "JETTY_HOME     =  $JETTY_HOME"
+    echo "JETTY_CONF     =  $JETTY_CONF"
+    echo "JETTY_RUN      =  $JETTY_RUN"
+    echo "JETTY_PID      =  $JETTY_PID"
+    echo "JETTY_PORT     =  $JETTY_PORT"
+    echo "JETTY_LOGS     =  $JETTY_LOGS"
+    echo "START_INI      =  $START_INI"
+    echo "CONFIGS        =  ${CONFIGS[*]}"
+    echo "JAVA_OPTIONS   =  ${JAVA_OPTIONS[*]}"
+    echo "JAVA           =  $JAVA"
+    echo "CLASSPATH      =  $CLASSPATH"
+    echo "RUN_CMD        =  ${RUN_CMD[*]}"
+    echo
+    
+    if [ -f "$JETTY_PID" ]
+    then
+      echo "Jetty running pid=$(< "$JETTY_PID")"
+      exit 0
+    fi
+    exit 1
+
+    ;;
+
+  *)
+    usage
+
+    ;;
+esac
+
+exit 0
\ No newline at end of file
--
libgit2 0.21.2