Merge pull request #41 from colab-community/rm-interlegis-refs

Remove interlegis references. Closes #36

Merge pull request #41 from colab-community/rm-interlegis-refs
Remove interlegis references. Closes #36
Sergio Oliveira
2 parents 0fbfa5bb 436a9317
Showing 19 changed files with 140 additions and 119 deletions Show diff stats
puppet/hieradata/common.yaml
puppet/modules/colab/templates/nginx/extra_conf.erb
puppet/modules/colab/templates/nginx/site_default.erb
requirements.txt
src/accounts/templates/accounts/user_update_form.html
src/accounts/views.py
src/colab/custom_settings.py
src/colab/local_settings-prod.py
src/locale/pt_BR/LC_MESSAGES/django.po
src/static/css/screen.css
src/static/img/fav.ico
src/static/img/interlegis.ico
src/static/img/logo.png
src/static/img/logo.svg
src/static/img/logo_nav.png
src/static/img/logo_small.png
src/super_archives/utils/email.py
src/templates/base.html
src/templates/open-data.html
@@ -14,14 +14,9 @@ nginx::worker_processes: 8
 nginx::error_log: '/var/log/nginx/error.log'
 nginx::access_log: '/var/log/nginx/access.log'
  
-colab::mailman_archive_path: '/mnt/mailman/archives/'
+colab::mailman_archive_path: '/var/lib/mailman/archives/public/'
 colab::mailman_exclude_lists:
-  - saberes-divulgacao
-  - pml
   - mailman
-  - lexml-anuncions
 colab::hostnames: 
-  - colab.interlegis.leg.br
-  - colab.interlegis.gov.br
   - localhost
 colab::solr_project_path: '/home/colab/solr-4.6.1/colab'
@@ -1,8 +0,0 @@
-add_header Vary Accept-Encoding;
-add_header Cache-control public;
-
-log_format proxy '$remote_addr $http_x_forwarded_for '
-                 '$remote_user [$time_local] "$request" '
-                 '$upstream_status "$http_referer" '
-                 'response_time: $upstream_response_time '
-                 'cache_status: $upstream_cache_status';
 \ No newline at end of file
@@ -1,58 +0,0 @@
-upstream django {
-    server 127.0.0.1:8000;
-}
-
-server {
-    listen 80 default_server;
-    server_name _;
-    return 444;
-}
-
-server {
-    listen 80;
-
-    root /;
-    server_name colab.interlegis.leg.br colab01a.interlegis.leg.br colab01b.interlegis.leg.br colab.interlegis.gov.br colab-demo.tracy.com.br localhost;
-    
-    location @django {
-        proxy_hide_header Vary;
-        proxy_read_timeout 300s;
-        proxy_connect_timeout 300s;
-        proxy_pass_header Server;
-        proxy_set_header Host $http_host;
-        proxy_redirect off;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Scheme $scheme;
-        proxy_set_header X-Forwarded-Protocol https;
-        proxy_pass http://django;
-        access_log /var/log/nginx/proxy-access.log proxy;
-    }
-
-    location /http-bind {
-        proxy_pass http://127.0.0.1:5280;
-    }
-
-    location /chrome {
-        proxy_pass http://10.1.2.81;
-    }
-
-    location /raw-attachment {
-        proxy_pass http://10.1.2.81;
-    }
-
-    location /ci/static {
-        proxy_pass http://10.1.2.171:8080;
-    }
-
-    location /ci/adjuncts {
-        proxy_pass http://10.1.2.171:8080;
-    }
-
-    location / {
-        try_files /home/colab/colab/www$uri @django;
-    }
-    
-    location /static {
-      try_files /home/colab/colab/www$uri @django;
-    }
-}
@@ -47,7 +47,7 @@ diazo==1.0.5
  
 # Dpaste
 # TODO: Pull-request to mainstream repository
-git+https://github.com/interlegis/dpaste
+-e git+https://github.com/colab-community/dpaste@i18n/pt_BR#egg=dpaste
  
 # Mailman 2 REST API
 mailman-api==0.2.1
@@ -185,7 +185,7 @@ $(function() {
       <div class="panel panel-default">
         <div class="panel-heading">
           <h3 class="panel-title">
-            {% blocktrans %}Change <a href="http://repositorio.interlegis.gov.br/">SVN</a> and <a href="http://mensageiro.interlegis.gov.br/">XMPP Client</a> password{% endblocktrans %}
+            {% trans 'Change Password' %}
           </h3>
         </div>
         <div class="panel-body">
@@ -23,7 +23,6 @@ from conversejs.models import XMPPAccount
 from haystack.query import SearchQuerySet
  
 from super_archives.models import EmailAddress, Message
-from super_archives.utils.email import send_email_lists
 from search.utils import trans
 #from proxy.trac.models import WikiCollabCount, TicketCollabCount
 from .forms import (UserCreationForm, ListsForm, UserUpdateForm,
@@ -141,10 +140,6 @@ def signup(request):
  
     user = user_form.save()
  
-    mailing_lists = lists_form.cleaned_data.get('lists')
-    if mailing_lists:
-        send_email_lists(user, mailing_lists)
-
     # Check if the user's email have been used previously
     #   in the mainling lists to link the user to old messages
     email_addr, created = EmailAddress.objects.get_or_create(address=user.email)
@@ -154,6 +149,9 @@ def signup(request):
     email_addr.user = user
     email_addr.save()
  
+    mailing_lists = lists_form.cleaned_data.get('lists')
+    mailman.update_subscription(user.email, mailing_lists)
+
     messages.success(request, _('Your profile has been created!'))
     messages.warning(request, _('You must login to validated your profile. '
                                 'Profiles not validated are deleted in 24h.'))
 from settings import *
 from django.utils.translation import ugettext_lazy as _
  
+# Allow Django runserver to serve SVG files
+#   https://code.djangoproject.com/ticket/20162
+import mimetypes
+mimetypes.add_type('image/svg+xml', '.svg')
+
 DEBUG = False
  
 TEMPLATE_DEBUG = False
@@ -187,11 +192,6 @@ LOGGING = {
     }
 }
  
-COLAB_FROM_ADDRESS = '"Colab Interlegis" <noreply@interlegis.leg.br>'
-SERVER_EMAIL = COLAB_FROM_ADDRESS
-EMAIL_HOST = 'smtp.interlegis.leg.br'
-EMAIL_PORT = 25
-
 TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.auth.context_processors.auth',
     'django.core.context_processors.debug',
@@ -243,7 +243,7 @@ LOCALE_PATHS = (
  
 AUTH_USER_MODEL = 'accounts.User'
  
-ALLOWED_HOSTS = ['colab.interlegis.leg.br']
+ALLOWED_HOSTS = []
  
 from django.contrib.messages import constants as messages
 MESSAGE_TAGS = {
@@ -286,7 +286,6 @@ REVPROXY_ADD_REMOTE_USER = True
 # This URL must use SSL in order to keep chat sessions secure
 CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
  
-CONVERSEJS_AUTO_REGISTER = 'mensageiro.interlegis.gov.br'
 CONVERSEJS_ALLOW_CONTACT_REQUESTS = False
 CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True
  
@@ -304,7 +303,7 @@ DPASTE_EXPIRE_CHOICES = (
     ('never', _(u'Never')),
 )
 DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0]
-DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis'
+DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created from Colab DPaste'
 DPASTE_DEFAULT_GIST_NAME = 'colab_paste'
 DPASTE_LEXER_DEFAULT = 'text'
  
@@ -0,0 +1,54 @@
+
+import os
+import json
+
+from custom_settings import *
+
+SECRETS_FILE = '/home/colab/colab/secrets.json'
+
+if os.path.exists(SECRETS_FILE):
+    secrets = json.load(file(SECRETS_FILE))
+
+DEBUG = False
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+    ('Name Surname', 'email@provider.com'),
+)
+MANAGERS = ADMINS
+
+COLAB_FROM_ADDRESS = '"Colab" <noreply@domain.com>'
+SERVER_EMAIL = COLAB_FROM_ADDRESS
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+EMAIL_HOST = ''
+EMAIL_PORT = 25
+EMAIL_SUBJECT_PREFIX = ''
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = secrets.get('SECRET_KEY')
+
+SITE_URL = ''
+ALLOWED_HOSTS = []
+
+# XMPP Server
+CONVERSEJS_AUTO_REGISTER = ''
+
+DATABASES['default']['PASSWORD'] = secrets.get('COLAB_DB_PWD')
+DATABASES['default']['HOST'] = 'localhost'
+
+DATABASES['trac'] = 'trac_colab'
+DATABASES['trac']['PASSWORD'] = secrets.get('TRAC_DB_PWD')
+DATABASES['trac']['HOST'] = 'localhost'
+
+HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
+
+COLAB_TRAC_URL = 'http://localhost:5000/trac/'
+COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/'
+
+CONVERSEJS_ENABLED = False
+
+ROBOTS_NOINDEX = False
+
+RAVEN_CONFIG = {
+    'dsn': secrets.get('RAVEN_DSN', '') + '?timeout=30',
+}
@@ -273,15 +273,6 @@ msgstr &quot;Adicionar outro endereço de e-mail&quot;
 msgid "Add"
 msgstr "Adicionar"
  
-#: accounts/templates/accounts/user_update_form.html:188
-msgid ""
-"Change <a href=\"http://repositorio.interlegis.gov.br/\">SVN</a> and <a href="
-"\"http://mensageiro.interlegis.gov.br/\">XMPP Client</a> password"
-msgstr ""
-"Trocar a senha do <a href=\"http://repositorio.interlegis.gov.br/"
-"\">Repositório</a> e do <a href=\"http://mensageiro.interlegis.gov.br/"
-"\">Mensageiro</a>"
-
 #: accounts/templates/accounts/user_update_form.html:193
 msgid ""
 "This feature is available only for those who need to change the password for some "
@@ -1095,8 +1086,8 @@ msgid &quot;RSS - Latest Threads&quot;
 msgstr "RSS - Últimas Discussões"
  
 #: templates/open-data.html:6
-msgid "OpenData - Communities Interlegis"
-msgstr "OpenData - Comunidades Interlegis"
+msgid "OpenData"
+msgstr "OpenData"
  
 #: templates/open-data.html:7
 msgid ""
@@ -1484,9 +1475,6 @@ msgstr &quot;&quot;
 msgid "Paste it"
 msgstr ""
  
-#~ msgid "INTERLEGIS COMMUNITIES"
-#~ msgstr "COMUNIDADES INTERLEGIS"
-
 #~ msgid "Creative Commons - attribution, non-commercial"
 #~ msgstr "Creative Commons - atribuição e não-comercial"
  
@@ -24,6 +24,10 @@ li hr {
     margin-left: 10px;
 }
  
+.navbar-brand img {
+    height: 40px;
+}
+
 #user-menu .wrapper {
     padding: 3px 10px;
     white-space: nowrap;
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="645.0506"
+   height="192.82056"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-58.02724,-191.19295)"
+     id="layer1">
+    <path
+       d="m 63.02724,197.18097 0,154.59066 17.780425,0 1.96673,-0.52717 0,-78.99093 8.405162,0 0,78.03622 22.225453,0 0,-78.03622 5.92681,0 2.96343,0 0,78.53009 18.76816,0 0,-78.53009 6.23758,1.67135 0,76.85874 20.43302,0 0,-127.92007 32.10348,0 0,-26.6706 z"
+       id="path3078"
+       style="fill:#b9ce2a;fill-opacity:1;stroke:none" />
+    <path
+       d="m 274.98763,378.02549 0,-154.59066 -17.78042,0 -1.96673,0.52717 0,78.99093 -8.40516,0 0,-78.03622 -22.22546,0 0,78.03622 -5.92681,0 -2.96343,0 0,-78.53009 -18.76815,0 0,78.53009 -6.23758,-1.67135 0,-76.85874 -20.43302,0 0,127.92007 -32.10349,0 0,26.6706 z"
+       id="path3108"
+       style="fill:#aabac3;fill-opacity:1;stroke:none" />
+    <g
+       id="text3878"
+       style="font-size:141.21679688px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#595b5d;fill-opacity:0.90980392;stroke:none;font-family:Sans">
+      <path
+         d="m 367.92842,326.69158 c -0.94152,15.72214 -8.75551,23.5832 -23.44199,23.5832 l -23.5832,0 c -6.40186,0 -11.95638,-2.30654 -16.66358,-6.91962 -4.6131,-4.61307 -6.91964,-10.1676 -6.91963,-16.66358 l 0,-58.74619 c -10e-6,-6.40174 2.25946,-11.90919 6.77841,-16.52237 4.61306,-4.70712 10.21465,-7.06073 16.8048,-7.06084 l 23.5832,0 c 14.78062,1.1e-4 22.59461,7.86117 23.44199,23.58321 l -11.72099,0 c -0.94152,-7.90805 -4.84851,-11.86212 -11.721,-11.86221 l -11.86221,0 c -3.20095,9e-5 -5.97822,1.1769 -8.33179,3.53042 -2.2595,2.25955 -3.38924,5.03681 -3.3892,8.33179 l 0,58.74619 c -4e-5,3.20093 1.1297,5.97819 3.3892,8.33179 2.35357,2.35362 5.13084,3.53043 8.33179,3.53042 l 11.86221,0 c 6.96663,1e-5 10.87363,-3.95406 11.721,-11.86221 l 11.72099,0"
+         id="path3015"
+         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
+      <path
+         d="m 415.23164,267.94539 23.5832,0 c 6.40176,8e-5 11.90921,2.30662 16.52237,6.91962 4.613,4.61315 6.91954,10.1206 6.91962,16.52237 l 0,35.3042 c -8e-5,6.40184 -2.30662,11.95636 -6.91962,16.66358 -4.61316,4.61308 -10.12061,6.91962 -16.52237,6.91962 l -23.5832,0 c -6.40186,0 -11.95638,-2.30654 -16.66359,-6.91962 -4.61309,-4.61307 -6.91963,-10.1676 -6.91962,-16.66358 l 0,-35.3042 c -1e-5,-6.40177 2.30653,-11.90922 6.91962,-16.52237 4.70721,-4.613 10.26173,-6.91954 16.66359,-6.91962 m 0,23.44199 0,35.3042 c -4e-5,3.20093 1.12969,5.97819 3.3892,8.33179 2.35357,2.35362 5.13083,3.53043 8.33179,3.53042 3.29501,1e-5 6.07227,-1.1768 8.33179,-3.53042 2.35356,-2.3536 3.53036,-5.13086 3.53042,-8.33179 l 0,-35.3042 c -6e-5,-3.20086 -1.17686,-5.93104 -3.53042,-8.19058 -2.25952,-2.35354 -5.03678,-3.53035 -8.33179,-3.53042 -3.20096,7e-5 -5.97822,1.17688 -8.33179,3.53042 -2.25951,2.25954 -3.38924,4.98972 -3.3892,8.19058"
+         id="path3017"
+         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
+      <path
+         d="m 485.97684,350.27478 0,-105.9126 23.5832,0 0,105.9126 -23.5832,0"
+         id="path3019"
+         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
+      <path
+         d="m 580.30745,303.24959 0,-11.86221 c -6e-5,-3.20086 -1.17687,-5.93104 -3.53042,-8.19058 -2.25952,-2.35354 -5.03678,-3.53035 -8.33179,-3.53042 l -11.721,0 c -6.96672,7e-5 -10.87371,3.90707 -11.72099,11.721 l -11.86221,0 c 1.88288,-15.62792 9.74394,-23.44191 23.5832,-23.44199 l 23.58321,0 c 6.40176,8e-5 11.90921,2.30662 16.52236,6.91962 4.61301,4.61315 6.91954,10.1206 6.91963,16.52237 l 0,58.8874 -23.44199,0 0,-11.72099 c -0.94151,7.814 -4.89557,11.72099 -11.86221,11.72099 l -11.721,0 c -6.40185,0 -11.95638,-2.30654 -16.66358,-6.91962 -4.61309,-4.61307 -6.91963,-10.1676 -6.91962,-16.66358 l 0,0 c -10e-6,-6.4018 2.30653,-11.90925 6.91962,-16.52237 4.7072,-4.61304 10.26173,-6.91958 16.66358,-6.91962 l 23.58321,0 m 0,11.72099 -11.86221,0 c -3.20096,4e-5 -5.97822,1.17684 -8.33179,3.53042 -2.25951,2.2595 -3.38924,4.98969 -3.38921,8.19058 l 0,0 c -3e-5,3.20093 1.1297,5.97819 3.38921,8.33179 2.35357,2.35362 5.13083,3.53043 8.33179,3.53042 3.29501,1e-5 6.07227,-1.1768 8.33179,-3.53042 2.35355,-2.3536 3.53036,-5.13086 3.53042,-8.33179 l 0,-11.721"
+         id="path3021"
+         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
+      <path
+         d="m 627.46944,350.27478 0,-105.9126 23.5832,0 0,35.3042 c 0.47069,-3.95399 1.69457,-6.87247 3.67164,-8.75544 1.97699,-1.97695 4.66011,-2.96547 8.04936,-2.96555 l 11.86221,0 c 6.40176,8e-5 11.90921,2.30662 16.52236,6.91962 4.61301,4.61315 6.91954,10.1206 6.91963,16.52237 l 0,35.3042 c -9e-5,6.40184 -2.30662,11.95636 -6.91963,16.66358 -4.61315,4.61308 -10.1206,6.91962 -16.52236,6.91962 l -47.16641,0 m 23.5832,-11.72099 11.721,0 c 3.29501,1e-5 6.07227,-1.1768 8.33179,-3.53042 2.35355,-2.3536 3.53036,-5.13086 3.53042,-8.33179 l 0,-35.3042 c -6e-5,-3.20086 -1.17687,-5.93104 -3.53042,-8.19058 -2.25952,-2.35354 -5.03678,-3.53035 -8.33179,-3.53042 -3.20096,7e-5 -5.97822,1.17688 -8.33179,3.53042 -2.25951,2.25954 -3.38924,4.98972 -3.38921,8.19058 l 0,47.16641"
+         id="path3023"
+         style="font-variant:normal;font-stretch:normal;fill:#595b5d;font-family:Silom;-inkscape-font-specification:Silom" />
+    </g>
+  </g>
+</svg>
@@ -17,18 +17,3 @@ def send_verification_email(to, user, validation_key):
                                        'key': validation_key,
                                        'SITE_URL': settings.SITE_URL}))
     return colab_send_email(subject, message, to)
-
-
-def send_email_lists(user, mailing_lists):
-    """XXX: this should be done using API instead of emails"""
-
-    subject = _(u'Registration on the mailing list')
-    from_ = user.email
-    to = []
-    for list_name in mailing_lists:
-        # TODO: The following line needs to be generic. Domain should be stored in settings file
-        #  or database (perharps read directly from mailman).
-        subscribe_addr = list_name + '-subscribe@listas.interlegis.gov.br'
-        to.append(subscribe_addr)
-
-    mail.send_mail(subject, '', from_, to)
@@ -14,7 +14,7 @@
  
     <title>{% block title %}Colab{% endblock %} - Colab</title>
  
-    <link rel="shortcut icon" type="image/x-icon" href="{% static 'img/interlegis.ico' %}">
+    <link rel="shortcut icon" type="image/x-icon" href="{% static 'img/fav.ico' %}">
  
     <link rel="stylesheet" href="{% static 'third-party/bootstrap/css/bootstrap.min.css' %}" type="text/css" media="screen, projection" />
  
@@ -58,7 +58,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <a class="navbar-brand" href="/"><img alt="Colab" src="/static/img/logo_nav.png"></a>
+          <a class="navbar-brand" href="/"><img alt="Colab" src="{% static 'img/logo.svg' %}"></a>
         </div>
         <div class="collapse navbar-collapse navbar-main">
           <ul class="nav navbar-nav">
@@ -3,7 +3,7 @@
  
 {% block main-content %}
   <div class="col-lg-12">
-    <h2>{% trans "OpenData - Communities Interlegis" %}</h2>
+    <h2>{% trans "OpenData - Communities" %}</h2>
     <p>{% trans "If you are interested in any other data that is not provided by this API, please contact us via the ticketing system (you must be registered in order to create a ticket)." %}</p>
  
     <h3>{% trans "Retrieving data via API" %}</h3>
...	...	@@ -14,14 +14,9 @@ nginx::worker_processes: 8
14	14	nginx::error_log: '/var/log/nginx/error.log'
15	15	nginx::access_log: '/var/log/nginx/access.log'
16	16
17		-colab::mailman_archive_path: '/mnt/mailman/archives/'
	17	+colab::mailman_archive_path: '/var/lib/mailman/archives/public/'
18	18	colab::mailman_exclude_lists:
19		- - saberes-divulgacao
20		- - pml
21	19	- mailman
22		- - lexml-anuncions
23	20	colab::hostnames:
24		- - colab.interlegis.leg.br
25		- - colab.interlegis.gov.br
26	21	- localhost
27	22	colab::solr_project_path: '/home/colab/solr-4.6.1/colab'
...	...
...	...	@@ -1,8 +0,0 @@
1		-add_header Vary Accept-Encoding;
2		-add_header Cache-control public;
3		-
4		-log_format proxy '$remote_addr $http_x_forwarded_for '
5		- '$remote_user [$time_local] "$request" '
6		- '$upstream_status "$http_referer" '
7		- 'response_time: $upstream_response_time '
8		- 'cache_status: $upstream_cache_status';
9	0	\ No newline at end of file
...	...	@@ -1,58 +0,0 @@
1		-upstream django {
2		- server 127.0.0.1:8000;
3		-}
4		-
5		-server {
6		- listen 80 default_server;
7		- server_name _;
8		- return 444;
9		-}
10		-
11		-server {
12		- listen 80;
13		-
14		- root /;
15		- server_name colab.interlegis.leg.br colab01a.interlegis.leg.br colab01b.interlegis.leg.br colab.interlegis.gov.br colab-demo.tracy.com.br localhost;
16		-
17		- location @django {
18		- proxy_hide_header Vary;
19		- proxy_read_timeout 300s;
20		- proxy_connect_timeout 300s;
21		- proxy_pass_header Server;
22		- proxy_set_header Host $http_host;
23		- proxy_redirect off;
24		- proxy_set_header X-Real-IP $remote_addr;
25		- proxy_set_header X-Scheme $scheme;
26		- proxy_set_header X-Forwarded-Protocol https;
27		- proxy_pass http://django;
28		- access_log /var/log/nginx/proxy-access.log proxy;
29		- }
30		-
31		- location /http-bind {
32		- proxy_pass http://127.0.0.1:5280;
33		- }
34		-
35		- location /chrome {
36		- proxy_pass http://10.1.2.81;
37		- }
38		-
39		- location /raw-attachment {
40		- proxy_pass http://10.1.2.81;
41		- }
42		-
43		- location /ci/static {
44		- proxy_pass http://10.1.2.171:8080;
45		- }
46		-
47		- location /ci/adjuncts {
48		- proxy_pass http://10.1.2.171:8080;
49		- }
50		-
51		- location / {
52		- try_files /home/colab/colab/www$uri @django;
53		- }
54		-
55		- location /static {
56		- try_files /home/colab/colab/www$uri @django;
57		- }
58		-}
...	...	@@ -47,7 +47,7 @@ diazo==1.0.5
47	47
48	48	# Dpaste
49	49	# TODO: Pull-request to mainstream repository
50		-git+https://github.com/interlegis/dpaste
	50	+-e git+https://github.com/colab-community/dpaste@i18n/pt_BR#egg=dpaste
51	51
52	52	# Mailman 2 REST API
53	53	mailman-api==0.2.1
...	...
...	...	@@ -185,7 +185,7 @@ $(function() {
185	185	<div class="panel panel-default">
186	186	<div class="panel-heading">
187	187	<h3 class="panel-title">
188		- {% blocktrans %}Change <a href="http://repositorio.interlegis.gov.br/">SVN</a> and <a href="http://mensageiro.interlegis.gov.br/">XMPP Client</a> password{% endblocktrans %}
	188	+ {% trans 'Change Password' %}
189	189	</h3>
190	190	</div>
191	191	<div class="panel-body">
...	...
...	...	@@ -23,7 +23,6 @@ from conversejs.models import XMPPAccount
23	23	from haystack.query import SearchQuerySet
24	24
25	25	from super_archives.models import EmailAddress, Message
26		-from super_archives.utils.email import send_email_lists
27	26	from search.utils import trans
28	27	#from proxy.trac.models import WikiCollabCount, TicketCollabCount
29	28	from .forms import (UserCreationForm, ListsForm, UserUpdateForm,
...	...	@@ -141,10 +140,6 @@ def signup(request):
141	140
142	141	user = user_form.save()
143	142
144		- mailing_lists = lists_form.cleaned_data.get('lists')
145		- if mailing_lists:
146		- send_email_lists(user, mailing_lists)
147		-
148	143	# Check if the user's email have been used previously
149	144	# in the mainling lists to link the user to old messages
150	145	email_addr, created = EmailAddress.objects.get_or_create(address=user.email)
...	...	@@ -154,6 +149,9 @@ def signup(request):
154	149	email_addr.user = user
155	150	email_addr.save()
156	151
	152	+ mailing_lists = lists_form.cleaned_data.get('lists')
	153	+ mailman.update_subscription(user.email, mailing_lists)
	154	+
157	155	messages.success(request, _('Your profile has been created!'))
158	156	messages.warning(request, _('You must login to validated your profile. '
159	157	'Profiles not validated are deleted in 24h.'))
...	...
1	1	from settings import *
2	2	from django.utils.translation import ugettext_lazy as _
3	3
	4	+# Allow Django runserver to serve SVG files
	5	+# https://code.djangoproject.com/ticket/20162
	6	+import mimetypes
	7	+mimetypes.add_type('image/svg+xml', '.svg')
	8	+
4	9	DEBUG = False
5	10
6	11	TEMPLATE_DEBUG = False
...	...	@@ -187,11 +192,6 @@ LOGGING = {
187	192	}
188	193	}
189	194
190		-COLAB_FROM_ADDRESS = '"Colab Interlegis" <noreply@interlegis.leg.br>'
191		-SERVER_EMAIL = COLAB_FROM_ADDRESS
192		-EMAIL_HOST = 'smtp.interlegis.leg.br'
193		-EMAIL_PORT = 25
194		-
195	195	TEMPLATE_CONTEXT_PROCESSORS = (
196	196	'django.contrib.auth.context_processors.auth',
197	197	'django.core.context_processors.debug',
...	...	@@ -243,7 +243,7 @@ LOCALE_PATHS = (
243	243
244	244	AUTH_USER_MODEL = 'accounts.User'
245	245
246		-ALLOWED_HOSTS = ['colab.interlegis.leg.br']
	246	+ALLOWED_HOSTS = []
247	247
248	248	from django.contrib.messages import constants as messages
249	249	MESSAGE_TAGS = {
...	...	@@ -286,7 +286,6 @@ REVPROXY_ADD_REMOTE_USER = True
286	286	# This URL must use SSL in order to keep chat sessions secure
287	287	CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
288	288
289		-CONVERSEJS_AUTO_REGISTER = 'mensageiro.interlegis.gov.br'
290	289	CONVERSEJS_ALLOW_CONTACT_REQUESTS = False
291	290	CONVERSEJS_SHOW_ONLY_ONLINE_USERS = True
292	291
...	...	@@ -304,7 +303,7 @@ DPASTE_EXPIRE_CHOICES = (
304	303	('never', _(u'Never')),
305	304	)
306	305	DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0]
307		-DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis'
	306	+DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created from Colab DPaste'
308	307	DPASTE_DEFAULT_GIST_NAME = 'colab_paste'
309	308	DPASTE_LEXER_DEFAULT = 'text'
310	309
...	...
...	...	@@ -0,0 +1,54 @@
	1	+
	2	+import os
	3	+import json
	4	+
	5	+from custom_settings import *
	6	+
	7	+SECRETS_FILE = '/home/colab/colab/secrets.json'
	8	+
	9	+if os.path.exists(SECRETS_FILE):
	10	+ secrets = json.load(file(SECRETS_FILE))
	11	+
	12	+DEBUG = False
	13	+TEMPLATE_DEBUG = DEBUG
	14	+
	15	+ADMINS = (
	16	+ ('Name Surname', 'email@provider.com'),
	17	+)
	18	+MANAGERS = ADMINS
	19	+
	20	+COLAB_FROM_ADDRESS = '"Colab" <noreply@domain.com>'
	21	+SERVER_EMAIL = COLAB_FROM_ADDRESS
	22	+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
	23	+EMAIL_HOST = ''
	24	+EMAIL_PORT = 25
	25	+EMAIL_SUBJECT_PREFIX = ''
	26	+
	27	+# Make this unique, and don't share it with anybody.
	28	+SECRET_KEY = secrets.get('SECRET_KEY')
	29	+
	30	+SITE_URL = ''
	31	+ALLOWED_HOSTS = []
	32	+
	33	+# XMPP Server
	34	+CONVERSEJS_AUTO_REGISTER = ''
	35	+
	36	+DATABASES['default']['PASSWORD'] = secrets.get('COLAB_DB_PWD')
	37	+DATABASES['default']['HOST'] = 'localhost'
	38	+
	39	+DATABASES['trac'] = 'trac_colab'
	40	+DATABASES['trac']['PASSWORD'] = secrets.get('TRAC_DB_PWD')
	41	+DATABASES['trac']['HOST'] = 'localhost'
	42	+
	43	+HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
	44	+
	45	+COLAB_TRAC_URL = 'http://localhost:5000/trac/'
	46	+COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/'
	47	+
	48	+CONVERSEJS_ENABLED = False
	49	+
	50	+ROBOTS_NOINDEX = False
	51	+
	52	+RAVEN_CONFIG = {
	53	+ 'dsn': secrets.get('RAVEN_DSN', '') + '?timeout=30',
	54	+}
...	...
...	...	@@ -273,15 +273,6 @@ msgstr "Adicionar outro endereço de e-mail"
273	273	msgid "Add"
274	274	msgstr "Adicionar"
275	275
276		-#: accounts/templates/accounts/user_update_form.html:188
277		-msgid ""
278		-"Change <a href=\"http://repositorio.interlegis.gov.br/\">SVN</a> and <a href="
279		-"\"http://mensageiro.interlegis.gov.br/\">XMPP Client</a> password"
280		-msgstr ""
281		-"Trocar a senha do <a href=\"http://repositorio.interlegis.gov.br/"
282		-"\">Repositório</a> e do <a href=\"http://mensageiro.interlegis.gov.br/"
283		-"\">Mensageiro</a>"
284		-
285	276	#: accounts/templates/accounts/user_update_form.html:193
286	277	msgid ""
287	278	"This feature is available only for those who need to change the password for some "
...	...	@@ -1095,8 +1086,8 @@ msgid "RSS - Latest Threads"
1095	1086	msgstr "RSS - Últimas Discussões"
1096	1087
1097	1088	#: templates/open-data.html:6
1098		-msgid "OpenData - Communities Interlegis"
1099		-msgstr "OpenData - Comunidades Interlegis"
	1089	+msgid "OpenData"
	1090	+msgstr "OpenData"
1100	1091
1101	1092	#: templates/open-data.html:7
1102	1093	msgid ""
...	...	@@ -1484,9 +1475,6 @@ msgstr ""
1484	1475	msgid "Paste it"
1485	1476	msgstr ""
1486	1477
1487		-#~ msgid "INTERLEGIS COMMUNITIES"
1488		-#~ msgstr "COMUNIDADES INTERLEGIS"
1489		-
1490	1478	#~ msgid "Creative Commons - attribution, non-commercial"
1491	1479	#~ msgstr "Creative Commons - atribuição e não-comercial"
1492	1480
...	...
...	...	@@ -24,6 +24,10 @@ li hr {
24	24	margin-left: 10px;
25	25	}
26	26
	27	+.navbar-brand img {
	28	+ height: 40px;
	29	+}
	30	+
27	31	#user-menu .wrapper {
28	32	padding: 3px 10px;
29	33	white-space: nowrap;
...	...