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

Remove interlegis references. Closes #36

Author: seocam

puppet/hieradata/common.yaml

@@ -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'

puppet/modules/colab/templates/nginx/extra_conf.erb

@@ -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

puppet/modules/colab/templates/nginx/site_default.erb

@@ -185,7 +185,7 @@ <h3 class="panel-title">{% trans "Emails" %}</h3>
       <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">

requirements.txt

@@ -23,7 +23,6 @@
 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.'))

src/accounts/templates/accounts/user_update_form.html

@@ -1,6 +1,11 @@
 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 @@
     }
 }
 
-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 @@
 
 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 @@
 # 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 @@
     ('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'
 

src/accounts/views.py

@@ -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',
+}

src/colab/custom_settings.py

@@ -273,15 +273,6 @@ msgstr "Adicionar outro endereço de e-mail"
 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 "RSS - Latest Threads"
 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 ""
 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"
 

src/colab/local_settings-prod.py

@@ -24,6 +24,10 @@ li hr {
     margin-left: 10px;
 }
 
+.navbar-brand img {
+    height: 40px;
+}
+
 #user-menu .wrapper {
     padding: 3px 10px;
     white-space: nowrap;