From 46d6a0d59454bc090327738e897289632ad6022f Mon Sep 17 00:00:00 2001
From: Guilherme Andrade Del Cantoni <guilherme.cantoni@anatel.gov.br>
Date: Tue, 27 Sep 2016 22:46:31 -0300
Subject: [PATCH] Implementação do conteiner do servidor SMTP de testes - Mailcatcher

---
 Vagrantfile             | 37 ++++---------------------------------
 Vagrantfile_Distrib     |  3 ++-
 sei/ConfiguracaoSEI.php |  4 ++--
 3 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 68ee1b7..aef3245 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -8,58 +8,38 @@ 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/mysql/sei_2_6_0_BD_Ref_Exec.sql"
-#params_script_sip = params["script_sip"] || "../sei-db-ref-executivo/mysql/sip_2_6_0_BD_Ref_Exec.sql"
 params_memoria_vm = params["memoria_vm"] || "1024"
 
 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_download_checksum = "76a2a61de2d89f6cfd4d795e57cc4406"
-  # config.vm.box_download_checksum_type = "md5"
-  # config.vm.box = "minimum/centos-7-docker"
-  # config.vm.box = "centos/7"
   config.vm.box = "ubuntu/trusty64"
 
-  # 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)
+  config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher
 
   # 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 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
 
   config.vm.provision "shell", 
-    #args: [File.basename(params_script_sei), File.basename(params_script_sip)],
     inline: <<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
@@ -73,15 +53,9 @@ SCRIPT
     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 "sei_smtp", image: "munkyboy/fakesmtp",
+    docker.run "sei_smtp", image: "schickling/mailcatcher",
       daemonize: true,
-      args: "-p 2525:25"
+      args: "-p 1080:1080"
 
     # docker run -d --name sei_db -p 3306:3306 processoeletronico/mysql:latest
     docker.run "sei_db",  image: "processoeletronico/mysql:latest", 
@@ -104,10 +78,7 @@ SCRIPT
       args: "-p 80:80 --link sei_db:db --link sei_solr:solr --link sei_jod:jod --link sei_smtp:smtp -v /mnt/sei/src:/mnt/sei/src"
   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
   # A inicialização é realizada de forma sequencial para evitar conflito no mapeamento de volumes no Docker
-  config.vm.provision "shell", run: "always", inline: "docker restart sei_solr && docker restart sei_jod && docker restart sei_db && docker restart sei_www"
+  config.vm.provision "shell", run: "always", inline: "docker restart sei_solr && docker restart sei_jod && docker restart sei_smtp && docker restart sei_db && docker restart sei_www"
 end
diff --git a/Vagrantfile_Distrib b/Vagrantfile_Distrib
index e2d856d..cfc2b13 100644
--- a/Vagrantfile_Distrib
+++ b/Vagrantfile_Distrib
@@ -23,7 +23,8 @@ Vagrant.configure(2) do |config|
   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)
+  config.vm.network :forwarded_port, guest: 1080, host: 1080 # MailCatcher
 
   # Inicialização dos containers em caso de reinicialização da máquina host
-  config.vm.provision "shell", run: "always", inline: "docker restart sei_solr && docker restart sei_jod && docker restart sei_db && docker restart sei_www"
+  config.vm.provision "shell", run: "always", inline: "docker restart sei_solr && docker restart sei_jod && docker restart sei_smtp && docker restart sei_db && docker restart sei_www"
 end
diff --git a/sei/ConfiguracaoSEI.php b/sei/ConfiguracaoSEI.php
index 58ec94d..c876a4a 100644
--- a/sei/ConfiguracaoSEI.php
+++ b/sei/ConfiguracaoSEI.php
@@ -109,8 +109,8 @@ class ConfiguracaoSEI extends InfraConfiguracao  {
  	       
  	      'InfraMail' => array(
  	          'Tipo' => '2', //1 = sendmail (neste caso não é necessário configurar os atributos abaixo), 2 = SMTP
- 	          'Servidor' => getenv("JOD_PORT_8080_TCP_ADDR"),
- 	          'Porta' => getenv("JOD_PORT_8080_TCP_PORT"),
+ 	          'Servidor' => getenv("SMTP_PORT_1025_TCP_ADDR"),
+ 	          'Porta' => getenv("SMTP_PORT_1025_TCP_PORT"),
  	          'Codificacao' => '8bit', //8bit, 7bit, binary, base64, quoted-printable
  	          'Autenticar' => false, //se true então informar Usuario e Senha
  	          'Usuario' => '',
--
libgit2 0.21.2