From 1d92158ca876a2805a4f46ab5f7984e941a271c3 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Tue, 2 Sep 2014 19:00:17 -0300 Subject: [PATCH] Moved gitlab, jenkins and redmine to django apps --- src/proxy/admin.py | 3 --- src/proxy/gitlab/__init__.py | 0 src/proxy/gitlab/admin.py | 3 +++ src/proxy/gitlab/models.py | 3 +++ src/proxy/gitlab/tests.py | 3 +++ src/proxy/gitlab/urls.py | 10 ++++++++++ src/proxy/gitlab/views.py | 9 +++++++++ src/proxy/jenkins/__init__.py | 0 src/proxy/jenkins/admin.py | 3 +++ src/proxy/jenkins/models.py | 3 +++ src/proxy/jenkins/tests.py | 3 +++ src/proxy/jenkins/urls.py | 10 ++++++++++ src/proxy/jenkins/views.py | 8 ++++++++ src/proxy/redmine/__init__.py | 0 src/proxy/redmine/admin.py | 3 +++ src/proxy/redmine/models.py | 3 +++ src/proxy/redmine/tests.py | 3 +++ src/proxy/redmine/urls.py | 10 ++++++++++ src/proxy/redmine/views.py | 9 +++++++++ src/proxy/tests.py | 3 --- src/proxy/urls.py | 16 ---------------- src/proxy/views.py | 33 --------------------------------- 22 files changed, 83 insertions(+), 55 deletions(-) delete mode 100644 src/proxy/admin.py create mode 100644 src/proxy/gitlab/__init__.py create mode 100644 src/proxy/gitlab/admin.py create mode 100644 src/proxy/gitlab/models.py create mode 100644 src/proxy/gitlab/tests.py create mode 100644 src/proxy/gitlab/urls.py create mode 100644 src/proxy/gitlab/views.py create mode 100644 src/proxy/jenkins/__init__.py create mode 100644 src/proxy/jenkins/admin.py create mode 100644 src/proxy/jenkins/models.py create mode 100644 src/proxy/jenkins/tests.py create mode 100644 src/proxy/jenkins/urls.py create mode 100644 src/proxy/jenkins/views.py create mode 100644 src/proxy/redmine/__init__.py create mode 100644 src/proxy/redmine/admin.py create mode 100644 src/proxy/redmine/models.py create mode 100644 src/proxy/redmine/tests.py create mode 100644 src/proxy/redmine/urls.py create mode 100644 src/proxy/redmine/views.py delete mode 100644 src/proxy/tests.py delete mode 100644 src/proxy/urls.py delete mode 100644 src/proxy/views.py diff --git a/src/proxy/admin.py b/src/proxy/admin.py deleted file mode 100644 index 8c38f3f..0000000 --- a/src/proxy/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/src/proxy/gitlab/__init__.py b/src/proxy/gitlab/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/proxy/gitlab/__init__.py diff --git a/src/proxy/gitlab/admin.py b/src/proxy/gitlab/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/src/proxy/gitlab/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/src/proxy/gitlab/models.py b/src/proxy/gitlab/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/src/proxy/gitlab/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/src/proxy/gitlab/tests.py b/src/proxy/gitlab/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/src/proxy/gitlab/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/src/proxy/gitlab/urls.py b/src/proxy/gitlab/urls.py new file mode 100644 index 0000000..afe6440 --- /dev/null +++ b/src/proxy/gitlab/urls.py @@ -0,0 +1,10 @@ + +from django.conf.urls import patterns, url + +from .views import GitlabProxyView + + +urlpatterns = patterns('', + # Gitlab URLs + url(r'^gitlab/(?P.*)$', GitlabProxyView.as_view()), +) diff --git a/src/proxy/gitlab/views.py b/src/proxy/gitlab/views.py new file mode 100644 index 0000000..6726aa0 --- /dev/null +++ b/src/proxy/gitlab/views.py @@ -0,0 +1,9 @@ + +from django.conf import settings + +from ..utils import ColabProxyView + + +class GitlabProxyView(ColabProxyView): + upstream = settings.COLAB_GITLAB_URL + diazo_theme_template = 'proxy/gitlab.html' diff --git a/src/proxy/jenkins/__init__.py b/src/proxy/jenkins/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/proxy/jenkins/__init__.py diff --git a/src/proxy/jenkins/admin.py b/src/proxy/jenkins/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/src/proxy/jenkins/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/src/proxy/jenkins/models.py b/src/proxy/jenkins/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/src/proxy/jenkins/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/src/proxy/jenkins/tests.py b/src/proxy/jenkins/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/src/proxy/jenkins/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/src/proxy/jenkins/urls.py b/src/proxy/jenkins/urls.py new file mode 100644 index 0000000..8c499e4 --- /dev/null +++ b/src/proxy/jenkins/urls.py @@ -0,0 +1,10 @@ + +from django.conf.urls import patterns, url + +from .views import JenkinsProxyView + + +urlpatterns = patterns('', + # Jenkins URLs + url(r'^ci/(?P.*)$', JenkinsProxyView.as_view()), +) diff --git a/src/proxy/jenkins/views.py b/src/proxy/jenkins/views.py new file mode 100644 index 0000000..34f6af0 --- /dev/null +++ b/src/proxy/jenkins/views.py @@ -0,0 +1,8 @@ + +from django.conf import settings + +from ..utils import ColabProxyView + + +class JenkinsProxyView(ColabProxyView): + upstream = settings.COLAB_CI_URL diff --git a/src/proxy/redmine/__init__.py b/src/proxy/redmine/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/proxy/redmine/__init__.py diff --git a/src/proxy/redmine/admin.py b/src/proxy/redmine/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/src/proxy/redmine/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/src/proxy/redmine/models.py b/src/proxy/redmine/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/src/proxy/redmine/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/src/proxy/redmine/tests.py b/src/proxy/redmine/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/src/proxy/redmine/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/src/proxy/redmine/urls.py b/src/proxy/redmine/urls.py new file mode 100644 index 0000000..d8e908b --- /dev/null +++ b/src/proxy/redmine/urls.py @@ -0,0 +1,10 @@ + +from django.conf.urls import patterns, url + +from .views import RedmineProxyView + + +urlpatterns = patterns('', + # RedmineProxyView URLs + url(r'^redmine/(?P.*)$', RedmineProxyView.as_view()), +) diff --git a/src/proxy/redmine/views.py b/src/proxy/redmine/views.py new file mode 100644 index 0000000..3ceadb0 --- /dev/null +++ b/src/proxy/redmine/views.py @@ -0,0 +1,9 @@ + +from django.conf import settings + +from ..utils import ColabProxyView + + +class RedmineProxyView(ColabProxyView): + upstream = settings.COLAB_REDMINE_URL + diazo_theme_template = 'proxy/redmine.html' diff --git a/src/proxy/tests.py b/src/proxy/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/src/proxy/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/src/proxy/urls.py b/src/proxy/urls.py deleted file mode 100644 index 3dc853a..0000000 --- a/src/proxy/urls.py +++ /dev/null @@ -1,16 +0,0 @@ - -from django.conf.urls import patterns, include, url - -from .views import JenkinsProxyView, GitlabProxyView, RedmineProxyView - - -urlpatterns = patterns('', - # Jenkins URLs - url(r'^ci/(?P.*)$', JenkinsProxyView.as_view()), - - # Gitlab - url(r'^gitlab/(?P.*)$', GitlabProxyView.as_view()), - - # Redmine - url(r'^redmine/(?P.*)$', RedmineProxyView.as_view()) -) diff --git a/src/proxy/views.py b/src/proxy/views.py deleted file mode 100644 index 1a4cc5d..0000000 --- a/src/proxy/views.py +++ /dev/null @@ -1,33 +0,0 @@ - -import os - -from django.conf import settings - -from revproxy.views import ProxyView - - -CWD = os.path.abspath(os.path.dirname(__file__)) -DIAZO_RULES_DIR = os.path.join(CWD, 'diazo') - - -class JenkinsProxyView(ProxyView): - base_url = settings.COLAB_CI_URL - add_remote_user = settings.REVPROXY_ADD_REMOTE_USER - diazo_theme_template = 'base.html' - diazo_rules = os.path.join(DIAZO_RULES_DIR, 'jenkins.xml') - html5 = True - -class GitlabProxyView(ProxyView): - base_url = settings.COLAB_GITLAB_URL - add_remote_user = settings.REVPROXY_ADD_REMOTE_USER - diazo_theme_template = 'proxy/gitlab.html' - diazo_rules = os.path.join(DIAZO_RULES_DIR, 'gitlab.xml') - html5 = True - -class RedmineProxyView(ProxyView): - base_url = settings.COLAB_REDMINE_URL - add_remote_user = settings.REVPROXY_ADD_REMOTE_USER - diazo_theme_template = 'proxy/redmine.html' - diazo_rules = os.path.join(DIAZO_RULES_DIR, 'redmine.xml') - html5 = True - -- libgit2 0.21.2