Revert a bad change. Apparently past me knew what I was doing,

[htsworkflow.git] / htsworkflow / frontend / settings.py

diff --git a/htsworkflow/frontend/settings.py b/htsworkflow/frontend/settings.py
index 55b3cef65e6c389b4ed4852407b50886a4ba8010..ff88816d2bf4983eb961ac32f7d6f8be3c550f30 100644 (file)
--- a/htsworkflow/frontend/settings.py
+++ b/htsworkflow/frontend/settings.py
@@ -96,6 +96,8 @@ if options.has_option('frontend', 'notification_sender'):
     NOTIFICATION_SENDER = options.get('frontend', 'notification_sender')
 else:
     NOTIFICATION_SENDER = "noreply@example.com"
+NOTIFICATION_BCC = []
+options_to_list(options, NOTIFICATION_BCC, 'frontend', 'notification_bcc')
 
 # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
 DATABASE_ENGINE = options.get('frontend', 'database_engine')
@@ -198,7 +200,11 @@ options_to_dict(ALLOWED_ANALYS_IPS, 'allowed_analysis_hosts')
 #UPLOADTO_CONFIG_FILE = os.path.join(UPLOADTO_HOME, 'eland_config')
 #UPLOADTO_ELAND_RESULT_PACKS = os.path.join(UPLOADTO_HOME, 'eland_results')
 #UPLOADTO_BED_PACKS = os.path.join(UPLOADTO_HOME, 'bed_packs')
-RESULT_HOME_DIR='/Users/diane/proj/solexa/results/flowcells'
+# Where "results_dir" means directory with all the flowcells
+if options.has_option('frontend', 'results_dir'):
+    RESULT_HOME_DIR=os.path.expanduser(options.get('frontend', 'results_dir'))
+else:
+    RESULT_HOME_DIR='/tmp'
 
 LINK_FLOWCELL_STORAGE_DEVICE_URL = options.get('frontend', 'link_flowcell_storage_device_url')
 # PORT 9100 is default for Zebra tabletop/desktop printers