From 120844ba4f5f428bb78250a665d65f9f363e9a13 Mon Sep 17 00:00:00 2001
From: Carlos Vieira <edu.carlos.vieira@gmail.com>
Date: Tue, 31 Jan 2017 08:00:32 -0200
Subject: [PATCH] Modificação do docker-compose e do rancher a pedido da DTI

---
 Vagrantfile                   |  2 +-
 app/templates/exemplo.html    |  2 +-
 build.sh                      |  1 +
 docker/Dockerfile             |  2 +-
 docker/docker-compose.yml     | 20 ++++++++++++++++----
 docker/public_html/index.html |  2 +-
 docker/rancher-compose.yml    | 13 +++++++++++++
 makefile                      |  3 +++
 package.json                  |  4 +---
 provision.sh                  | 10 +++++-----
 provision_root.sh             | 24 +++++++++++++++++++++++-
 test/app.js                   | 32 --------------------------------
 test/zombie-test.js           | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 views/barra.ejs               |  1 -
 views/index.ejs               |  1 -
 views/jquery.ejs              |  1 -
 views/opensansbold.ejs        |  1 -
 17 files changed, 130 insertions(+), 67 deletions(-)
 create mode 100644 docker/rancher-compose.yml
 delete mode 100644 test/app.js
 delete mode 100644 views/barra.ejs
 delete mode 100644 views/index.ejs
 delete mode 100644 views/jquery.ejs
 delete mode 100644 views/opensansbold.ejs

diff --git a/Vagrantfile b/Vagrantfile
index bb07091..0172061 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,7 +4,7 @@ Vagrant.require_version ">= 1.5.0"
 VAGRANTFILE_API_VERSION = '2'
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = 'ubuntu/trusty64'
+  config.vm.box = 'ubuntu/xenial64'
   config.vm.provision :shell, path: 'provision_root.sh'
   config.vm.provision :shell, path: 'provision.sh', privileged: false
   config.vm.network :forwarded_port, guest: 5000, host: 5000
diff --git a/app/templates/exemplo.html b/app/templates/exemplo.html
index 98bb1e0..abb6677 100644
--- a/app/templates/exemplo.html
+++ b/app/templates/exemplo.html
@@ -6,7 +6,7 @@
 		  <meta property="creator.productor" content="http://estruturaorganizacional.dados.gov.br/id/unidade-organizacional/2981"/>
        <title>Barra Brasil</title>
 	<!--Adicionado para fazer os testes via mocha/chai-jq/chai/zombie -->
-<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="static/jquery.js"></script>
 <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
 
 		  <script type="text/javascript">
diff --git a/build.sh b/build.sh
index a76ba2d..39aee10 100755
--- a/build.sh
+++ b/build.sh
@@ -29,6 +29,7 @@ then
     cp templates/$profile/barra-brasil-es.js ../docker/public_html/barra.js.es #Copiando enquanto a barra é estática.
     cp templates/exemplo.html ../docker/public_html/index.html #Copiando enquanto a barra é estática.
     cp static/opensans-bold.woff ../docker/public_html/static/ #Copiando enquanto a barra é estática.
+    cp static/jquery-2.1.3.min.js ../docker/public_html/jquery.js #Copiando enquanto a barra é estática.
     echo "Copiado"
 else
     echo "Erro. O profile '$profile' não existe."
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3d76114..8adcfc7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM httpd:2.4
 
 COPY ./conf/httpd.conf /usr/local/apache2/conf/httpd.conf
 
-ADD public_html /usr/local/apache2/htdocs
+ADD ./public_html /usr/local/apache2/htdocs
 
 EXPOSE 80
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index ea4b334..28a1344 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,4 +1,16 @@
-web:
-  image: govbr/barra.govbr
-  ports:
-   - "80:80"
+certificado-barrabrasil:
+  ports:
+  - 443:80
+  labels:
+    io.rancher.loadbalancer.ssl.ports: '443'
+  tty: true
+  image: rancher/load-balancer-service
+  links:
+  - web:web
+  stdin_open: true
+web:
+  ports:
+  - 80:80/tcp
+  tty: true
+  image: hub.docker.planejamento.gov.br/barra-brasil:2.1.21
+  stdin_open: true
diff --git a/docker/public_html/index.html b/docker/public_html/index.html
index 98bb1e0..abb6677 100644
--- a/docker/public_html/index.html
+++ b/docker/public_html/index.html
@@ -6,7 +6,7 @@
 		  <meta property="creator.productor" content="http://estruturaorganizacional.dados.gov.br/id/unidade-organizacional/2981"/>
        <title>Barra Brasil</title>
 	<!--Adicionado para fazer os testes via mocha/chai-jq/chai/zombie -->
-<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="static/jquery.js"></script>
 <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
 
 		  <script type="text/javascript">
diff --git a/docker/rancher-compose.yml b/docker/rancher-compose.yml
new file mode 100644
index 0000000..4e2c641
--- /dev/null
+++ b/docker/rancher-compose.yml
@@ -0,0 +1,13 @@
+certificado-barrabrasil:
+  scale: 1
+  load_balancer_config:
+    haproxy_config: {}
+  default_cert: barra.brasil
+  health_check:
+    port: 42
+    interval: 2000
+    unhealthy_threshold: 3
+    healthy_threshold: 2
+    response_timeout: 2000
+web:
+  scale: 1
diff --git a/makefile b/makefile
index c840528..277b8af 100644
--- a/makefile
+++ b/makefile
@@ -21,7 +21,10 @@ testReport:
 		npm run testReport 
 
 teste:
+		docker-compose -f docker/docker-compose.yml up -d
 		npm run test
+		docker rm -f docker_web_1
+		docker rmi -f docker_web
 
 
 		
diff --git a/package.json b/package.json
index 14aeec0..713ef58 100644
--- a/package.json
+++ b/package.json
@@ -6,12 +6,10 @@
 "coffee-script": "1.12.3",
 "coffeescript-concat": "1.0.14",
 "uglifyjs": "2.4.10",
-"express": "4.14.1",
 "chai": "3.5.0",
 "chai-jq": "0.0.9",
 "mocha": "3.2.0",
-"zombie": "5.0.5",
-"ejs": "2.5.5"
+"zombie": "5.0.5"
 },
 "optionalDependencies": {},
 "scripts": {
diff --git a/provision.sh b/provision.sh
index 7ac9686..1b07622 100644
--- a/provision.sh
+++ b/provision.sh
@@ -2,22 +2,22 @@
 set -e -x -o pipefail
 export DEBIAN_FRONTEND='noninteractive'
 
-cd /home/vagrant
+cd /home/$(whoami)
 
 # Installing nvm
 wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | bash
 
 # This enables NVM without a logout/login
-export NVM_DIR="/home/vagrant/.nvm"
+export NVM_DIR="/home/"$(whoami)"/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
 
 # Install a node and alias
-nvm install iojs
-nvm alias default iojs
+nvm install node
+nvm alias default node
 
 rm -Rf barra-govbr/
 GIT_SSL_NO_VERIFY=true git clone http://portal.softwarepublico.gov.br/gitlab/govbr/barra-govbr.git
 
 cd barra-govbr
 
-PROFILE=default make run
+PROFILE=default make test
diff --git a/provision_root.sh b/provision_root.sh
index 59da1fc..5066a65 100644
--- a/provision_root.sh
+++ b/provision_root.sh
@@ -2,14 +2,36 @@
 set -e -x -o pipefail
 export DEBIAN_FRONTEND='noninteractive'
 
-sudo apt-get update
+apt-get update
 
 apt-get install -y \
+  apt-transport-https \
+  ca-certificates \
+  curl \
   git \
+  linux-image-extra-$(uname -r) \
+  linux-image-extra-virtual \
   python-dev \
   python-pip \
   python-virtualenv \
   ruby
 
+curl -fsSL https://yum.dockerproject.org/gpg | sudo apt-key add -
+
+add-apt-repository \
+       "deb https://apt.dockerproject.org/repo/ \
+       ubuntu-$(lsb_release -cs) \
+       main"
+
+apt-get update
+
+apt-get -y install docker-engine
+
+usermod -aG docker ubuntu
+
+curl -L "https://github.com/docker/compose/releases/download/1.10.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+
+chmod +x /usr/local/bin/docker-compose
+  
 gem install sass
 
diff --git a/test/app.js b/test/app.js
deleted file mode 100644
index 30815ae..0000000
--- a/test/app.js
+++ /dev/null
@@ -1,32 +0,0 @@
-var express = require("express");
-
-var app = express();
-
-
-	// read the port from the environment, else set to 3000
-	app.set("port", process.env.PORT || 3000);
-   app.set('view engine', 'ejs');
-
-app.get('/', function (req, res)
-{
-    res.render('index');
-});
-
-app.get('/barra.js', function (req, res)
-{
-    res.render('barra');
-});
-
-app.get('/jquery.js', function (req, res)
-{
-    res.render('jquery');
-});
-
-app.get('/static/opensans-bold.woff', function (req, res)
-{
-    res.render('opensansbold');
-});
-
-// instead of starting the application here, export the app so that it can
-// be loaded differently based on the use case (running the app vs testing)
-module.exports = app;
diff --git a/test/zombie-test.js b/test/zombie-test.js
index b7ab9f0..5e2bcbb 100644
--- a/test/zombie-test.js
+++ b/test/zombie-test.js
@@ -2,34 +2,65 @@ var chai = require("chai"), plugin = require("chai-jq");
 chai.use(plugin);
 
 var expect = require("chai").expect,
-	Browser = require("zombie"),
-	app = require("./app");
+	Browser = require("zombie");
 
 describe("Testes de conteúdo de HTML da barra", function() {
-	var server, browser, barraUrl, barraFonte;
-	barraUrl = "http://localhost:3000/";
-   barraFonte = "http://localhost:3000/static/opensans-bold.woff";
-	before(function() {
-		server = app.listen(3000);
-	});
+	var browser, barraUrl, barraFonte;
+	barraUrl = "http://localhost/";
+   barraFonte = "http://localhost/static/opensans-bold.woff";
 
 	beforeEach(function() {
 		browser = new Browser();
 		browser.runScripts = true;
 	});
 
-	after(function() {
-		// depois dos testes fechar o servidor
-		server.close();
-	});
-
-	it("trocar o conteúdo do #barra-brasil pelo correto", function(done) {
+	it("trocar o conteúdo do #barra-brasil pelo correto em pt-BR", function(done) {
+			if (!browser.headers) {
+			    browser.headers = {};
+			}
+			browser.headers['Accept-Language'] = 'pt-BR';
 			browser.visit(barraUrl, function() {
          var inner_barra = browser.document.getElementById("barra-brasil");
 			expect(inner_barra.innerHTML).to.equal("<div id=\"wrapper-barra-brasil\"><div class=\"brasil-flag\"><a href=\"http://brasil.gov.br\" class=\"link-barra\">Brasil</a></div><span class=\"acesso-info\"><a href=\"http://www.servicos.gov.br/?pk_campaign=barrabrasil&amp;orgao=http://estruturaorganizacional.dados.gov.br/id/unidade-organizacional/2981\" class=\"link-barra\" id=\"barra-brasil-orgao\">Serviços</a></span><nav><ul class=\"list\"><li><a href=\"#\" id=\"menu-icon\"></a></li><li class=\"list-item first\"><a href=\"http://brasil.gov.br/barra#participe\" class=\"link-barra\">Participe</a></li><li class=\"list-item\"><a href=\"http://brasil.gov.br/barra#acesso-informacao\" class=\"link-barra\">Acesso à informação</a></li><li class=\"list-item\"><a href=\"http://www.planalto.gov.br/legislacao\" class=\"link-barra\">Legislação</a></li><li class=\"list-item last last-item\"><a href=\"http://brasil.gov.br/barra#orgaos-atuacao-canais\" class=\"link-barra\">Canais</a></li></ul></nav><a class=\"logo-vlibras\" href=\"http://www.vlibras.gov.br/\" aria-label=\"Acessível em Libras\"></a></div>");
 			done();
 		});
    });
+
+	it("trocar o conteúdo do #barra-brasil pelo correto em en", function(done) {
+			if (!browser.headers) {
+			    browser.headers = {};
+			}
+			browser.headers['Accept-Language'] = 'en';
+			browser.visit(barraUrl, function() {
+         var inner_barra = browser.document.getElementById("barra-brasil");
+			expect(inner_barra.innerHTML).to.equal("<div id=\"wrapper-barra-brasil\"><div class=\"brasil-flag\"><a href=\"http://brasil.gov.br\" class=\"link-barra\">Brazil</a></div><span class=\"acesso-info\"><a href=\"http://www.servicos.gov.br/?pk_campaign=barrabrasil&amp;orgao=http://estruturaorganizacional.dados.gov.br/id/unidade-organizacional/2981\" class=\"link-barra\" id=\"barra-brasil-orgao\">Services</a></span><nav><ul class=\"list\"><li><a href=\"#\" id=\"menu-icon\"></a></li><li class=\"list-item first\"><a href=\"http://brasil.gov.br/barra#participe\" class=\"link-barra\">Participate</a></li><li class=\"list-item\"><a href=\"http://brasil.gov.br/barra#acesso-informacao\" class=\"link-barra\">Information access</a></li><li class=\"list-item\"><a href=\"http://www.planalto.gov.br/legislacao\" class=\"link-barra\">Legislation</a></li><li class=\"list-item last last-item\"><a href=\"http://brasil.gov.br/barra#orgaos-atuacao-canais\" class=\"link-barra\">Information channels</a></li></ul></nav><a class=\"logo-vlibras\" href=\"http://www.vlibras.gov.br/\" aria-label=\"Acessible in Brazilian Sign Language\"></a></div>");
+			done();
+		});
+   });
+
+	it("trocar o conteúdo do #barra-brasil pelo correto em es", function(done) {
+			if (!browser.headers) {
+			    browser.headers = {};
+			}
+			browser.headers['Accept-Language'] = 'es';
+			browser.visit(barraUrl, function() {
+         var inner_barra = browser.document.getElementById("barra-brasil");
+			expect(inner_barra.innerHTML).to.equal("<div id=\"wrapper-barra-brasil\"><div class=\"brasil-flag\"><a href=\"http://brasil.gov.br\" class=\"link-barra\">Brasil</a></div><span class=\"acesso-info\"><a href=\"http://www.servicos.gov.br/?pk_campaign=barrabrasil&amp;orgao=http://estruturaorganizacional.dados.gov.br/id/unidade-organizacional/2981\" class=\"link-barra\" id=\"barra-brasil-orgao\">Servicios</a></span><nav><ul class=\"list\"><li><a href=\"#\" id=\"menu-icon\"></a></li><li class=\"list-item first\"><a href=\"http://brasil.gov.br/barra#participe\" class=\"link-barra\">Participar</a></li><li class=\"list-item\"><a href=\"http://brasil.gov.br/barra#acesso-informacao\" class=\"link-barra\">Acceso a la información</a></li><li class=\"list-item\"><a href=\"http://www.planalto.gov.br/legislacao\" class=\"link-barra\">Legislación</a></li><li class=\"list-item last last-item\"><a href=\"http://brasil.gov.br/barra#orgaos-atuacao-canais\" class=\"link-barra\">Canales de información</a></li></ul></nav><a class=\"logo-vlibras\" href=\"http://www.vlibras.gov.br/\" aria-label=\"Acesso a la Libras\"></a></div>");
+			done();
+		});
+   });
+
+	it("trocar o conteúdo do #barra-brasil pelo correto em fr", function(done) {
+			if (!browser.headers) {
+			    browser.headers = {};
+			}
+			browser.headers['Accept-Language'] = 'fr';
+			browser.visit(barraUrl, function() {
+         var inner_barra = browser.document.getElementById("barra-brasil");
+			expect(inner_barra.innerHTML).to.equal("<div id=\"wrapper-barra-brasil\"><div class=\"brasil-flag\"><a href=\"http://brasil.gov.br\" class=\"link-barra\">Brésil</a></div><span class=\"acesso-info\"><a href=\"http://www.servicos.gov.br/?pk_campaign=barrabrasil&amp;orgao=http://estruturaorganizacional.dados.gov.br/id/unidade-organizacional/2981\" class=\"link-barra\" id=\"barra-brasil-orgao\">Prestations de service</a></span><nav><ul class=\"list\"><li><a href=\"#\" id=\"menu-icon\"></a></li><li class=\"list-item first\"><a href=\"http://brasil.gov.br/barra#participe\" class=\"link-barra\">Prende part</a></li><li class=\"list-item\"><a href=\"http://brasil.gov.br/barra#acesso-informacao\" class=\"link-barra\">Accès à l'information</a></li><li class=\"list-item\"><a href=\"http://www.planalto.gov.br/legislacao\" class=\"link-barra\">Législation</a></li><li class=\"list-item last last-item\"><a href=\"http://brasil.gov.br/barra#orgaos-atuacao-canais\" class=\"link-barra\">Les canaux d'information</a></li></ul></nav><a class=\"logo-vlibras\" href=\"http://www.vlibras.gov.br/\" aria-label=\"Accessible en brésilien langue des signes\"></a></div>");
+			done();
+		});
+   });
 	
    it("trocar o conteúdo do #footer-brasil pelo correto", function(done) {
 		   browser.visit(barraUrl, function() {
@@ -41,11 +72,30 @@ describe("Testes de conteúdo de HTML da barra", function() {
 
    it("A fonte deve estar respondendo", function(done) {
 		   browser.visit(barraFonte, function() {
+			expect(browser.response.headers._headers[3]).to.include.members(['etag']);
+			expect(browser.response.headers._headers[9]).to.include.members(['access-control-allow-origin', '*']);
+			expect(browser.response.headers._headers[11]).to.include.members(["content-type","application/x-font-woff"]);
          expect(browser.response.status).to.equal(200);
 			done();
 		});
 	});
 
+   it("Cabeçalhos  HTTP do barra.js devem estar ok", function(done) {
+			if (!browser.headers) {
+	    		browser.headers = {};
+			}
+			browser.headers['Accept-Encoding'] = 'gzip';		   
+			browser.visit("http://localhost/barra.js", function() {
+			expect(browser.response.headers._headers[6]).to.include.members(['etag']);
+			expect(browser.response.headers._headers[8]).to.include.members(['content-encoding', 'gzip']);
+			expect(browser.response.headers._headers[9]).to.include.members(['cache-control','max-age=604800']);
+			expect(browser.response.headers._headers[11]).to.include.members(['access-control-allow-origin', '*']);
+         expect(browser.response.status).to.equal(200);
+			done();
+		});
+	});
+
+
    it("a barra deve ter o css correto para visualizacao maior que 960px");
 
    it("a barra deve ter o css correto para visualização menor que 960px");
diff --git a/views/barra.ejs b/views/barra.ejs
deleted file mode 100644
index 46cf959..0000000
--- a/views/barra.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<% include ../app/static/barra-brasil.js %>
diff --git a/views/index.ejs b/views/index.ejs
deleted file mode 100644
index bdbcd1c..0000000
--- a/views/index.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<% include ../app/templates/exemplo.html %>
diff --git a/views/jquery.ejs b/views/jquery.ejs
deleted file mode 100644
index 4e2de6d..0000000
--- a/views/jquery.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<% include ../app/static/jquery-2.1.3.min.js %>
diff --git a/views/opensansbold.ejs b/views/opensansbold.ejs
deleted file mode 100644
index f17f27b..0000000
--- a/views/opensansbold.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<% include ../app/static/opensans-bold.woff %>
--
libgit2 0.21.2