amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Manual merge of ungleich/master into opennebula-integration

Browse source
This commit is contained in:
M.Ravi 2017-04-24 03:01:05 +05:30
commit d537fcb118
227 changed files with 25686 additions and 482 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dynamicweb/settings/__init__.py
View file

@ -1 +1,3 @@
from .base import *
SECRET_KEY = '18730s9n9sjxamsuJSismxOIAmso102xjAs'

1
dynamicweb/settings/base.py
View file

@ -110,6 +110,7 @@ INSTALLED_APPS = (
'digitalglarus',
'nosystemd',
'datacenterlight',
'alplora',
)
MIDDLEWARE_CLASSES = (

5
dynamicweb/settings/local.py
View file

@ -37,7 +37,10 @@ OPENNEBULA_PASSWORD = 'opennebula'
OPENNEBULA_PROTOCOL = 'http'
# The ip address or the domain name of the opennebula infrastructure
OPENNEBULA_DOMAIN = '192.168.182.173'
# OPENNEBULA_DOMAIN = '192.168.182.173'
# OPENNEBULA_DOMAIN = '192.168.122.225'
#OPENNEBULA_DOMAIN = '192.168.182.176'
OPENNEBULA_DOMAIN = '192.168.42.35'
# The port to connect in order to send an xmlrpc request. The default
# port is 2633

4
dynamicweb/settings/prod.py
View file

@ -2,6 +2,7 @@ from .base import *
ADMINS = (
('Nico Schottelius', 'nico.schottelius@ungleich.ch'),
('Raul Ascencio', 'raul.ascencio@yandex.com'),
('Tomislav Rupcic','tmslav@gmail.com'),
)
@ -16,5 +17,6 @@ REGISTRATION_MESSAGE['message'] = REGISTRATION_MESSAGE['message'].format(host='d
ALLOWED_HOSTS = [
".ungleich.ch",
"digital.glarus.ungleich.ch" ,
"digital.glarus.ungleich.ch",
".alplora.ch"
]

4
dynamicweb/urls.py
View file

@ -11,13 +11,11 @@ from ungleich_page.views import LandingView
import debug_toolbar
urlpatterns = [ url(r'^index.html$', LandingView.as_view()),
url(r'^hosting/', include('hosting.urls', namespace="hosting")),
url(r'^hosting/', include('hosting.urls', namespace="hosting")),
url(r'^railshosting/', RailsHostingView.as_view(), name="rails.hosting"),
url(r'^nodehosting/', NodeJSHostingView.as_view(), name="node.hosting"),
url(r'^djangohosting/', DjangoHostingView.as_view(), name="django.hosting"),
url(r'^nosystemd/', include('nosystemd.urls', namespace="nosystemd")),
url(r'^datacenterlight', include('datacenterlight.urls', namespace="datacenterlight")),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
url(r'^jsi18n/(?P<packages>\S+?)/$',
'django.views.i18n.javascript_catalog'),
@ -27,6 +25,8 @@ urlpatterns = [ url(r'^index.html$', LandingView.as_view()),
urlpatterns += i18n_patterns('',
url(r'^/?$', LandingView.as_view()),
url(r'^admin/', include(admin.site.urls)),
url(r'^datacenterlight', include('datacenterlight.urls', namespace="datacenterlight")),
url(r'^alplora', include('alplora.urls', namespace="alplora")),
url(r'^membership/', include(membership_urls)),
url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus")),