From 2ba9718397ca600f53e9e0f8936b174a0e4b870c Mon Sep 17 00:00:00 2001 From: Charles Oliveira <18oliveira.charles@gmail.com> Date: Mon, 27 Oct 2014 11:42:04 -0200 Subject: [PATCH] Applied new proxy structure --- colab/proxy/noosfero/__init__.py | 3 +++ colab/proxy/noosfero/admin.py | 3 +++ colab/proxy/noosfero/apps.py | 7 +++++++ colab/proxy/noosfero/diazo.xml | 19 +++++++++++++++++++ colab/proxy/noosfero/models.py | 3 +++ colab/proxy/noosfero/templates/proxy/noosfero.html | 12 ++++++++++++ colab/proxy/noosfero/tests.py | 3 +++ colab/proxy/noosfero/urls.py | 10 ++++++++++ colab/proxy/noosfero/views.py | 9 +++++++++ src/colab/local_settings-digital.py | 65 ----------------------------------------------------------------- src/proxy/diazo/gitlab.xml | 29 ----------------------------- src/proxy/diazo/noosfero.xml | 19 ------------------- src/proxy/templates/proxy/gitlab.html | 47 ----------------------------------------------- src/proxy/templates/proxy/noosfero.html | 12 ------------ src/static/img/fav.ico | Bin 4606 -> 0 bytes src/static/img/logo.svg | 106 ---------------------------------------------------------------------------------------------------------- 16 files changed, 69 insertions(+), 278 deletions(-) create mode 100644 colab/proxy/noosfero/__init__.py create mode 100644 colab/proxy/noosfero/admin.py create mode 100644 colab/proxy/noosfero/apps.py create mode 100644 colab/proxy/noosfero/diazo.xml create mode 100644 colab/proxy/noosfero/models.py create mode 100644 colab/proxy/noosfero/templates/proxy/noosfero.html create mode 100644 colab/proxy/noosfero/tests.py create mode 100644 colab/proxy/noosfero/urls.py create mode 100644 colab/proxy/noosfero/views.py delete mode 100644 src/colab/local_settings-digital.py delete mode 100644 src/proxy/diazo/gitlab.xml delete mode 100644 src/proxy/diazo/noosfero.xml delete mode 100644 src/proxy/templates/proxy/gitlab.html delete mode 100644 src/proxy/templates/proxy/noosfero.html delete mode 100644 src/static/img/fav.ico delete mode 100644 src/static/img/logo.svg diff --git a/colab/proxy/noosfero/__init__.py b/colab/proxy/noosfero/__init__.py new file mode 100644 index 0000000..8474295 --- /dev/null +++ b/colab/proxy/noosfero/__init__.py @@ -0,0 +1,3 @@ + + +default_app_config = 'colab.proxy.noosfero.apps.ProxyNoosferoAppConfig' diff --git a/colab/proxy/noosfero/admin.py b/colab/proxy/noosfero/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/colab/proxy/noosfero/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/colab/proxy/noosfero/apps.py b/colab/proxy/noosfero/apps.py new file mode 100644 index 0000000..1c6e33b --- /dev/null +++ b/colab/proxy/noosfero/apps.py @@ -0,0 +1,7 @@ + +from ..utils.apps import ColabProxiedAppConfig + + +class ProxyNoosferoAppConfig(ColabProxiedAppConfig): + name = 'colab.proxy.noosfero' + verbose_name = 'Noosfero Proxy' diff --git a/colab/proxy/noosfero/diazo.xml b/colab/proxy/noosfero/diazo.xml new file mode 100644 index 0000000..7e6821c --- /dev/null +++ b/colab/proxy/noosfero/diazo.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/colab/proxy/noosfero/models.py b/colab/proxy/noosfero/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/colab/proxy/noosfero/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/colab/proxy/noosfero/templates/proxy/noosfero.html b/colab/proxy/noosfero/templates/proxy/noosfero.html new file mode 100644 index 0000000..51b1ddb --- /dev/null +++ b/colab/proxy/noosfero/templates/proxy/noosfero.html @@ -0,0 +1,12 @@ +{% extends 'base.html' %} +{% load static %} + +{% block head_css %} + +{% endblock %} + +{% block head_js %} + +{% endblock %} diff --git a/colab/proxy/noosfero/tests.py b/colab/proxy/noosfero/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/colab/proxy/noosfero/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/colab/proxy/noosfero/urls.py b/colab/proxy/noosfero/urls.py new file mode 100644 index 0000000..7e793e2 --- /dev/null +++ b/colab/proxy/noosfero/urls.py @@ -0,0 +1,10 @@ + +from django.conf.urls import patterns, url + +from .views import NoosferoProxyView + + +urlpatterns = patterns('', + # Noosfero URLs + url(r'^social/(?P.*)$', NoosferoProxyView.as_view()), +) diff --git a/colab/proxy/noosfero/views.py b/colab/proxy/noosfero/views.py new file mode 100644 index 0000000..f12bede --- /dev/null +++ b/colab/proxy/noosfero/views.py @@ -0,0 +1,9 @@ + +from django.conf import settings + +from ..utils.views import ColabProxyView + + +class NoosferoProxyView(ColabProxyView): + app_label = 'noosfero' + diazo_theme_template = 'proxy/noosfero.html' diff --git a/src/colab/local_settings-digital.py b/src/colab/local_settings-digital.py deleted file mode 100644 index 3e2322b..0000000 --- a/src/colab/local_settings-digital.py +++ /dev/null @@ -1,65 +0,0 @@ - -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 = ( - ('Paulo Meirelles', 'paulo@softwarelivre.org'), -) - -MANAGERS = ADMINS - -COLAB_FROM_ADDRESS = '"Portal do Software Publico" ' -SERVER_EMAIL = COLAB_FROM_ADDRESS -EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -EMAIL_HOST = 'localhost' -EMAIL_PORT = 25 -EMAIL_SUBJECT_PREFIX = '' - -# Make this unique, and don't share it with anybody. -SECRET_KEY = secrets.get('SECRET_KEY') - -SITE_URL = 'http://beta.softwarepublico.gov.br' -BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace('https', 'http')] - -ALLOWED_HOSTS = ['beta.softwarepublico.gov.br'] - -INTERNAL_IPS = ('127.0.0.1', ) - -DATABASES['default']['PASSWORD'] = secrets.get('COLAB_DB_PWD') -DATABASES['default']['HOST'] = 'localhost' - -TRAC_ENABLED = True - -if TRAC_ENABLED: - from trac_settings import * - DATABASES['trac'] = TRAC_DATABASE - 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_CI_URL = 'http://localhost:8080/ci/' -COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/' -COLAB_REDMINE_URL = 'http://localhost:9080/redmine/' - -CONVERSEJS_ENABLED = False - -DIAZO_THEME = SITE_URL - -ROBOTS_NOINDEX = True - -RAVEN_CONFIG = { - 'dsn': secrets.get('RAVEN_DSN', '') + '?timeout=30', -} diff --git a/src/proxy/diazo/gitlab.xml b/src/proxy/diazo/gitlab.xml deleted file mode 100644 index 2be848e..0000000 --- a/src/proxy/diazo/gitlab.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/proxy/diazo/noosfero.xml b/src/proxy/diazo/noosfero.xml deleted file mode 100644 index abe4e69..0000000 --- a/src/proxy/diazo/noosfero.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/proxy/templates/proxy/gitlab.html b/src/proxy/templates/proxy/gitlab.html deleted file mode 100644 index 6694ca5..0000000 --- a/src/proxy/templates/proxy/gitlab.html +++ /dev/null @@ -1,47 +0,0 @@ -{% extends 'base.html' %} -{% load static %} - -{% block head_css %} - -{% endblock %} - -{% block head_js %} - - - - -{% endblock %} diff --git a/src/proxy/templates/proxy/noosfero.html b/src/proxy/templates/proxy/noosfero.html deleted file mode 100644 index 51b1ddb..0000000 --- a/src/proxy/templates/proxy/noosfero.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends 'base.html' %} -{% load static %} - -{% block head_css %} - -{% endblock %} - -{% block head_js %} - -{% endblock %} diff --git a/src/static/img/fav.ico b/src/static/img/fav.ico deleted file mode 100644 index d4f9b19..0000000 Binary files a/src/static/img/fav.ico and /dev/null differ diff --git a/src/static/img/logo.svg b/src/static/img/logo.svg deleted file mode 100644 index 2329baa..0000000 --- a/src/static/img/logo.svg +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- libgit2 0.21.2