Merge branch 'GREG-159-djangoq-config' into 'master'

Move djangoq settings to base settings

See merge request !222

gregsite/settings/base.py

@@ -304,3 +304,15 @@ ORGREG_EXTRA_IDS = []
 # Acronyms to be imported as identifiers from orgreg. List of acronym values, supported ones are: nob, nno, eng
 # Example list: ["nob"]
 ORGREG_ACRONYMS = []
+
+# Settings related to Django-q used for scheduling tasks in the future.
+# We use it to queue creation of Notification objects related to roles when start/end dates are in the future
+Q_CLUSTER = {
+    "name": "greg",
+    "workers": 4,
+    "timeout": 90,
+    "retry": 120,
+    "queue_limit": 50,
+    "bulk": 10,
+    "orm": "default",
+}

gregsite/settings/dev.py

@@ -30,16 +30,12 @@ CEREBRUM_CLIENT = {
 }
 CEREBRUM_HIERARCHICAL_ACCESS = True
 
-Q_CLUSTER = {
-    "name": "greg",
-    "workers": 4,
-    "timeout": 90,
-    "retry": 120,
-    "queue_limit": 50,
-    "bulk": 10,
-    "orm": "default",
-    "sync": True,
-}
+
+Q_CLUSTER.update(
+    {
+        "sync": True,
+    }
+)
 
 AUTHENTICATION_BACKENDS = [
     "gregui.authentication.auth_backends.DevBackend",  # Fake dev backend