Merge branch 'master' of https://github.com/institutotim/timtec

institutotim · Nov 1, 2017 · d8920c8 · d8920c8
2 parents 104dba4 + ed7aadb
commit d8920c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/docs/deploy.md b/docs/deploy.md
@@ -10,7 +10,6 @@
 
 Você precisa de um servidor com algum dos seguintes sistemas operacionais:
 
-* Ubuntu 14.04
 * Ubuntu 16.04 
 * Debian 9.0
 
@@ -114,11 +113,11 @@ root@server# passwd timtec-production
 timtec-production@server$ git clone https://github.com/institutotim/timtec.git
 ```
 
-* Faça checkout para versão atual (4.1.5)
+* Faça checkout para versão atual (4.1.8)
 
 ```
 timtec-production@server$ cd timtec
-timtec-production@server$ git checkout 4.1.5
+timtec-production@server$ git checkout 4.1.8
 ```
 
 ## Criando Banco de dados
@@ -253,4 +252,4 @@ root@server# service nginx start
 
 A instalação não terminou ainda! Precisamos criar o usuário inicial, configurar o domínio do django, o envio de email e a API do youtube.
 
-Proceda a página de [Configurações](Configurações.md) para continuar.
+Proceda a página de [Configurações](config.md) para continuar.
diff --git a/timtec/settings_local.py.template b/timtec/settings_local.py.template
@@ -18,8 +18,8 @@ INSTALLED_APPS += (
 
 # TODO: Clone into /themes/themes_custom your theme and change this
 # path name to the your theme
-# TIMTEC_THEME = 'themes_custom/path-to-theme1/path-to-theme1'
-TIMTEC_THEME = 'timtec_theme'  # Use this to Timtec theme
+# TIMTEC_THEME = 'themes_custom/path-to-theme1/path-to-theme1'  
+TIMTEC_THEME = 'if_theme'  # Use this to Timtec theme
 
 COMPRESS_PRECOMPILERS = (
     ('text/less', '%s/node_modules/less/bin/lessc {infile} {outfile} --include-path="%s/bower_components/bootstrap:%s/themes/default/static:%s/themes/default/static/less:%s/bower_components"' % (PROJECT_ROOT, PROJECT_ROOT, PROJECT_ROOT, PROJECT_ROOT, PROJECT_ROOT)),
@@ -116,4 +116,4 @@ LOGGING = {
 
 INTEGRATION_LOGIN_URL = "http://nest-nne-plataforma-api.app/?login=1"
 INTEGRATION_PROFILE_URL = "http://nest-nne-plataforma-api.app/api/v1/profile/from_subscription"
-INTEGRATION_JWT_SECRET = "secret"
+INTEGRATION_JWT_SECRET = "secret"