Moved gitlab, jenkins and redmine to django apps

Sergio Oliveira
1 parent 2be27bf9
Showing 22 changed files with 83 additions and 55 deletions Show diff stats
src/proxy/admin.py
src/proxy/gitlab/__init__.py
src/proxy/gitlab/admin.py
src/proxy/gitlab/models.py
src/proxy/gitlab/tests.py
src/proxy/gitlab/urls.py
src/proxy/gitlab/views.py
src/proxy/jenkins/__init__.py
src/proxy/jenkins/admin.py
src/proxy/jenkins/models.py
src/proxy/jenkins/tests.py
src/proxy/jenkins/urls.py
src/proxy/jenkins/views.py
src/proxy/redmine/__init__.py
src/proxy/redmine/admin.py
src/proxy/redmine/models.py
src/proxy/redmine/tests.py
src/proxy/redmine/urls.py
src/proxy/redmine/views.py
src/proxy/tests.py
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,10 @@
+
+from django.conf.urls import patterns, url
+
+from .views import GitlabProxyView
+
+
+urlpatterns = patterns('',
+    # Gitlab URLs
+    url(r'^gitlab/(?P<path>.*)$', GitlabProxyView.as_view()),
+)
@@ -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'
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,10 @@
+
+from django.conf.urls import patterns, url
+
+from .views import JenkinsProxyView
+
+
+urlpatterns = patterns('',
+    # Jenkins URLs
+    url(r'^ci/(?P<path>.*)$', JenkinsProxyView.as_view()),
+)
@@ -0,0 +1,8 @@
+
+from django.conf import settings
+
+from ..utils import ColabProxyView
+
+
+class JenkinsProxyView(ColabProxyView):
+    upstream = settings.COLAB_CI_URL
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,10 @@
+
+from django.conf.urls import patterns, url
+
+from .views import RedmineProxyView
+
+
+urlpatterns = patterns('',
+    # RedmineProxyView URLs
+    url(r'^redmine/(?P<path>.*)$', RedmineProxyView.as_view()),
+)
@@ -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'
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
@@ -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<path>.*)$', JenkinsProxyView.as_view()),
-
-    # Gitlab
-    url(r'^gitlab/(?P<path>.*)$', GitlabProxyView.as_view()),
-
-    # Redmine
-    url(r'^redmine/(?P<path>.*)$', RedmineProxyView.as_view())
-)
@@ -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
-
...	...	@@ -1,3 +0,0 @@
1		-from django.contrib import admin
2		-
3		-# Register your models here.
...	...	@@ -0,0 +1,3 @@
	1	+from django.contrib import admin
	2	+
	3	+# Register your models here.
...	...
...	...	@@ -0,0 +1,3 @@
	1	+from django.db import models
	2	+
	3	+# Create your models here.
...	...
...	...	@@ -0,0 +1,3 @@
	1	+from django.test import TestCase
	2	+
	3	+# Create your tests here.
...	...
...	...	@@ -0,0 +1,10 @@
	1	+
	2	+from django.conf.urls import patterns, url
	3	+
	4	+from .views import GitlabProxyView
	5	+
	6	+
	7	+urlpatterns = patterns('',
	8	+ # Gitlab URLs
	9	+ url(r'^gitlab/(?P<path>.*)$', GitlabProxyView.as_view()),
	10	+)
...	...
...	...	@@ -0,0 +1,9 @@
	1	+
	2	+from django.conf import settings
	3	+
	4	+from ..utils import ColabProxyView
	5	+
	6	+
	7	+class GitlabProxyView(ColabProxyView):
	8	+ upstream = settings.COLAB_GITLAB_URL
	9	+ diazo_theme_template = 'proxy/gitlab.html'
...	...
...	...	@@ -0,0 +1,10 @@
	1	+
	2	+from django.conf.urls import patterns, url
	3	+
	4	+from .views import JenkinsProxyView
	5	+
	6	+
	7	+urlpatterns = patterns('',
	8	+ # Jenkins URLs
	9	+ url(r'^ci/(?P<path>.*)$', JenkinsProxyView.as_view()),
	10	+)
...	...
...	...	@@ -0,0 +1,8 @@
	1	+
	2	+from django.conf import settings
	3	+
	4	+from ..utils import ColabProxyView
	5	+
	6	+
	7	+class JenkinsProxyView(ColabProxyView):
	8	+ upstream = settings.COLAB_CI_URL
...	...
...	...	@@ -0,0 +1,10 @@
	1	+
	2	+from django.conf.urls import patterns, url
	3	+
	4	+from .views import RedmineProxyView
	5	+
	6	+
	7	+urlpatterns = patterns('',
	8	+ # RedmineProxyView URLs
	9	+ url(r'^redmine/(?P<path>.*)$', RedmineProxyView.as_view()),
	10	+)
...	...
...	...	@@ -1,3 +0,0 @@
1		-from django.test import TestCase
2		-
3		-# Create your tests here.