From 75eba8cdc9f5e6bcb7ddd9ed523d639a969b3644 Mon Sep 17 00:00:00 2001 From: carlos.vieira Date: Mon, 7 Apr 2014 15:17:33 -0300 Subject: [PATCH] build.sh: Chamando o build para o default se nenhum profile ? especificado. barrabrasil.py: tratamento de SSL para testes. barra-copa.scss: modificado url da fonte para pegar http ou https conforme especificado pelo usu?rio --- app/barrabrasil.py | 13 ++++++++++++- build.sh | 5 +++-- recipes/copa2014/assets/barra-copa.scss | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/barrabrasil.py b/app/barrabrasil.py index 28846d7..b8147f4 100644 --- a/app/barrabrasil.py +++ b/app/barrabrasil.py @@ -1,6 +1,15 @@ from flask import Flask, url_for, render_template, request, Response, make_response import hashlib,webbrowser -from sys import argv + +# Criar Key e certificado +# openssl genrsa 1024 > ssl.key +# openssl req -new -x509 -nodes -sha1 -days 365 -key ssl.key > ssl.cert + +#from OpenSSL import SSL +#ctx = SSL.Context(SSL.SSLv23_METHOD) +#ctx.use_privatekey_file('ssl.key') +#ctx.use_certificate_file('ssl.cert') + app = Flask(__name__) @app.route('/') @@ -37,4 +46,6 @@ if __name__ == '__main__': profile = 'default' webbrowser.open("http://127.0.0.1:5000/",new=2) app.run(debug=False) + #webbrowser.open("https://127.0.0.1:5000/",new=2) + #app.run(debug=False,ssl_context=ctx) diff --git a/build.sh b/build.sh index 68edfe5..b17477a 100755 --- a/build.sh +++ b/build.sh @@ -7,11 +7,12 @@ else profile='default' fi -if test -d "recipes/$1" +if test -d "recipes/$profile" then cd recipes/$profile sh ./compile.sh - python ../../app/barrabrasil.py $profile + cd ../../app + python barrabrasil.py $profile else echo "Error. Profile $1 does not exist." fi diff --git a/recipes/copa2014/assets/barra-copa.scss b/recipes/copa2014/assets/barra-copa.scss index 796b408..ddf5447 100644 --- a/recipes/copa2014/assets/barra-copa.scss +++ b/recipes/copa2014/assets/barra-copa.scss @@ -1,4 +1,4 @@ -$borderPadrao: 1px solid #d3a725; +$borderPadrao: 1px solid #D3A725; $widthPadrao: 960px; #barra-brasil { @@ -29,7 +29,7 @@ $widthPadrao: 960px; font-family: "Open Sans"; font-style: normal; font-weight: 700; - src: local("Open Sans Bold"), local("OpenSans-Bold"), url("http://barra.brasil.gov.br/static/opensans-bold.woff") format("woff"); + src: local("Open Sans Bold"), local("OpenSans-Bold"), url("//barra.brasil.gov.br/static/opensans-bold.woff") format("woff"); } -- libgit2 0.21.2