diff --git a/coldfront/config/base.py b/coldfront/config/base.py index eb7fa3e00..3c70aa1d5 100644 --- a/coldfront/config/base.py +++ b/coldfront/config/base.py @@ -67,10 +67,10 @@ 'fontawesome_free', 'mathfilters', # 'debug_toolbar', - 'ifxuser', - 'author', - 'ifxbilling', - 'ifxreport', + # 'ifxuser', + # 'author', + # 'ifxbilling', + # 'ifxreport', ] # ColdFront Apps diff --git a/coldfront/config/plugins/ifx.py b/coldfront/config/plugins/ifx.py index 284ff5ada..616fb534c 100644 --- a/coldfront/config/plugins/ifx.py +++ b/coldfront/config/plugins/ifx.py @@ -4,9 +4,10 @@ ''' import os from decimal import Decimal -from coldfront.config.base import INSTALLED_APPS, MIDDLEWARE +from coldfront.config.base import MIDDLEWARE, INSTALLED_APPS -INSTALLED_APPS = ['ifxuser'] + INSTALLED_APPS + ['author', 'ifxbilling', 'rest_framework.authtoken', 'ifxreport', 'django_extensions'] +INSTALLED_APPS.insert(0, 'ifxuser') +INSTALLED_APPS += ['author', 'ifxbilling', 'rest_framework.authtoken', 'ifxreport', 'django_extensions'] MIDDLEWARE += [ 'author.middlewares.AuthorDefaultBackendMiddleware', diff --git a/coldfront/config/settings.py b/coldfront/config/settings.py index 2f997c562..51f0080f5 100644 --- a/coldfront/config/settings.py +++ b/coldfront/config/settings.py @@ -2,7 +2,6 @@ from split_settings.tools import optional, include from coldfront.config.env import ENV, PROJECT_ROOT - # enable correct url to be displayed in e.g. email correspondence USE_X_FORWARDED_HOST = True @@ -18,10 +17,11 @@ # ColdFront plugin settings plugin_configs = { + 'PLUGIN_IFX': 'plugins/ifx.py', 'PLUGIN_SLURM': 'plugins/slurm.py', 'PLUGIN_IQUOTA': 'plugins/iquota.py', 'PLUGIN_FREEIPA': 'plugins/freeipa.py', - 'PLUGIN_SYSMON': 'plugins/system_montior.py', + 'PLUGIN_SYSMON': 'plugins/system_monitor.py', 'PLUGIN_XDMOD': 'plugins/xdmod.py', 'PLUGIN_AUTH_OIDC': 'plugins/openid.py', 'PLUGIN_AUTH_LDAP': 'plugins/ldap.py', @@ -30,7 +30,6 @@ 'PLUGIN_LDAP': 'plugins/ldap_fasrc.py', 'PLUGIN_SFTOCF': 'plugins/sftocf.py', 'PLUGIN_FASRC': 'plugins/fasrc.py', - 'PLUGIN_IFX': 'plugins/ifx.py', 'PLUGIN_FASRC_MONITORING': 'plugins/fasrc_monitoring.py', 'PLUGIN_ISILON': 'plugins/isilon.py', }