fix settings for kumquat and token

skylime · Aug 14, 2014 · b71e965 · b71e965
1 parent 7dc137c
commit b71e965
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/copy/tmp/kumquat-settings.py b/copy/tmp/kumquat-settings.py
@@ -31,6 +31,7 @@
 	'mysql',
 	'ftp',
 	'status',
+	'mail',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -58,3 +59,6 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
 STATIC_URL = '/static/'
+
+# Redirect after LOGIN
+LOGIN_REDIRECT_URL = '/'
diff --git a/copy/var/zoneinit/includes/50-kumquat.sh b/copy/var/zoneinit/includes/50-kumquat.sh
@@ -18,6 +18,10 @@ mdata-put kumquat_admin ${ADMIN_KUMQUAT}
 WWW_UID=$(id -u www)
 WWW_GID=$(id -g www)
 
+CORE_MAIL_TOKEN=${CORE_MAIL_TOKEN:-$(mdata-get core_mail_token 2>/dev/null)} || \
+CORE_MAIL_TOKEN=$(od -An -N8 -x /dev/random | head -1 | tr -d ' ');
+mdata-put core_mail_token ${CORE_MAIL_TOKEN}
+
 # check if database exists already
 if [ -d /var/mysql/kumquat ]; then
 	echo 'Database already exists, maybe some migration script will run in the future.'
@@ -78,6 +82,7 @@ KUMQUAT_VHOST_GID        = ${WWW_GID}
 KUMQUAT_USE_ZFS          = ${USE_ZFS}
 KUMQUAT_VHOST_DATASET    = "${VHOST_DATASET}"
 KUMQUAT_WEBSERVER_RELOAD = 'svcadm refresh apache'
+CORE_MAIL_TOKEN          = ${CORE_MAIL_TOKEN}
 EOF
 
 # Init django data and create admin user