Merge branch 'master' of https://code.grnet.gr/git/flowspy

[flowspy] / settings.py.dist

diff --git a/settings.py.dist b/settings.py.dist
index c0708c5..76f18d3 100644 (file)
--- a/settings.py.dist
+++ b/settings.py.dist
@@ -26,7 +26,7 @@ DATABASES = {
         'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
         'OPTIONS':  {
-        "init_command": "SET storage_engine=INNODB",
+        "init_command": "SET storage_engine=MYISAM",
         }
     }
 }
@@ -132,7 +132,7 @@ INSTALLED_APPS = (
     'django.contrib.flatpages',
     'flowspec',
     'poller',
-#    'south',
+    'south',
     # Uncomment the next line to enable the admin:
     'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
@@ -171,7 +171,7 @@ CELERY_CONCURRENCY = 1
 # List of modules to import when celery starts.
 CELERY_IMPORTS = ("flowspec.tasks", )
 
-SERVER_EMAIL = "noreply@grnet.gr"
+SERVER_EMAIL = "GRNET FoD Service <noreply@grnet.gr>"
 EMAIL_SUBJECT_PREFIX = "[FoD] "
 
 LOG_FILE_LOCATION = here("log")
@@ -190,16 +190,21 @@ SHIB_LOGOUT_URL = 'https://example.com/Shibboleth.sso/Logout'
 NOTIFY_ADMIN_MAILS = ["admin@admin.com"]
 
 UI_USER_THEN_ACTIONS = ['discard', 'rate-limit']
+UI_USER_PROTOCOLS = ['icmp', 'tcp', 'udp']
 
 PROTECTED_SUBNETS = ['10.10.0.0/16']
 
-CELERYBEAT_SCHEDULE = {
-    # Executes every day at 01:35 AM 
+CELERYBEAT_SCHEDULE = { 
     "every-day-sync": {
         "task": "flowspec.tasks.check_sync",
         "schedule": crontab(minute=01, hour=01),
         "args": (),
     },
+    "notify-expired": {
+        "task": "flowspec.tasks.notify_expired",
+        "schedule": crontab(minute=01, hour=02),
+        "args": (),
+    },
 }
 # whois
 PRIMARY_WHOIS = 'whois.grnet.gr'