Manual merge of ungleich/master into opennebula-integration

dynamicweb/settings/__init__.py

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

dynamicweb/settings/base.py

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

dynamicweb/settings/local.py

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

dynamicweb/settings/prod.py

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