|
@@ -185,53 +185,53 @@ NAVIGATOR = ConfigSection(
|
|
|
help=_t('Base URL to Navigator API.'),
|
|
help=_t('Base URL to Navigator API.'),
|
|
|
dynamic_default=default_navigator_url),
|
|
dynamic_default=default_navigator_url),
|
|
|
AUTH_TYPE=Config(
|
|
AUTH_TYPE=Config(
|
|
|
- key="navmetaserver_auth_type",
|
|
|
|
|
|
|
+ key="navmetadataservice_auth_type",
|
|
|
help=_t("Which authentication to use: CM or external via LDAP or SAML."),
|
|
help=_t("Which authentication to use: CM or external via LDAP or SAML."),
|
|
|
default='CMDB'),
|
|
default='CMDB'),
|
|
|
|
|
|
|
|
AUTH_CM_USERNAME=Config(
|
|
AUTH_CM_USERNAME=Config(
|
|
|
- key="auth_cmusername",
|
|
|
|
|
|
|
+ key="navmetadataservice_cmdb_user",
|
|
|
help=_t("Username of the CM user used for authentication."),
|
|
help=_t("Username of the CM user used for authentication."),
|
|
|
dynamic_default=get_auth_username),
|
|
dynamic_default=get_auth_username),
|
|
|
AUTH_CM_PASSWORD=Config(
|
|
AUTH_CM_PASSWORD=Config(
|
|
|
- key="auth_cmpassword",
|
|
|
|
|
|
|
+ key="navmetadataservice_cmdb_password",
|
|
|
help=_t("CM password of the user used for authentication."),
|
|
help=_t("CM password of the user used for authentication."),
|
|
|
private=True,
|
|
private=True,
|
|
|
dynamic_default=get_navigator_cm_password),
|
|
dynamic_default=get_navigator_cm_password),
|
|
|
AUTH_CM_PASSWORD_SCRIPT=Config(
|
|
AUTH_CM_PASSWORD_SCRIPT=Config(
|
|
|
- key="auth_password_script",
|
|
|
|
|
|
|
+ key="navmetadataservice_cmdb_password_script",
|
|
|
help=_t("Execute this script to produce the CM password. This will be used when the plain password is not set."),
|
|
help=_t("Execute this script to produce the CM password. This will be used when the plain password is not set."),
|
|
|
private=True,
|
|
private=True,
|
|
|
type=coerce_password_from_script,
|
|
type=coerce_password_from_script,
|
|
|
default=None),
|
|
default=None),
|
|
|
|
|
|
|
|
AUTH_LDAP_USERNAME=Config(
|
|
AUTH_LDAP_USERNAME=Config(
|
|
|
- key="auth_ldapusername",
|
|
|
|
|
|
|
+ key="navmetadataservice_ldap_user",
|
|
|
help=_t("Username of the LDAP user used for authentication."),
|
|
help=_t("Username of the LDAP user used for authentication."),
|
|
|
dynamic_default=get_auth_username),
|
|
dynamic_default=get_auth_username),
|
|
|
AUTH_LDAP_PASSWORD=Config(
|
|
AUTH_LDAP_PASSWORD=Config(
|
|
|
- key="auth_ldappassword",
|
|
|
|
|
|
|
+ key="navmetadataservice_ldap_password",
|
|
|
help=_t("LDAP password of the user used for authentication."),
|
|
help=_t("LDAP password of the user used for authentication."),
|
|
|
private=True,
|
|
private=True,
|
|
|
dynamic_default=get_navigator_ldap_password),
|
|
dynamic_default=get_navigator_ldap_password),
|
|
|
AUTH_LDAP_PASSWORD_SCRIPT=Config(
|
|
AUTH_LDAP_PASSWORD_SCRIPT=Config(
|
|
|
- key="auth_ldappassword_script",
|
|
|
|
|
|
|
+ key="navmetadataservice_ldap_password_script",
|
|
|
help=_t("Execute this script to produce the LDAP password. This will be used when the plain password is not set."),
|
|
help=_t("Execute this script to produce the LDAP password. This will be used when the plain password is not set."),
|
|
|
private=True,
|
|
private=True,
|
|
|
type=coerce_password_from_script,
|
|
type=coerce_password_from_script,
|
|
|
default=None),
|
|
default=None),
|
|
|
|
|
|
|
|
AUTH_SAML_USERNAME=Config(
|
|
AUTH_SAML_USERNAME=Config(
|
|
|
- key="auth_samlusername",
|
|
|
|
|
|
|
+ key="navmetadataservice_saml_user",
|
|
|
help=_t("Username of the SAML user used for authentication."),
|
|
help=_t("Username of the SAML user used for authentication."),
|
|
|
dynamic_default=get_auth_username),
|
|
dynamic_default=get_auth_username),
|
|
|
AUTH_SAML_PASSWORD=Config(
|
|
AUTH_SAML_PASSWORD=Config(
|
|
|
- key="auth_samlpassword",
|
|
|
|
|
|
|
+ key="navmetadataservice_saml_password",
|
|
|
help=_t("SAML password of the user used for authentication."),
|
|
help=_t("SAML password of the user used for authentication."),
|
|
|
private=True,
|
|
private=True,
|
|
|
dynamic_default=get_navigator_saml_password),
|
|
dynamic_default=get_navigator_saml_password),
|
|
|
AUTH_SAML_PASSWORD_SCRIPT=Config(
|
|
AUTH_SAML_PASSWORD_SCRIPT=Config(
|
|
|
- key="auth_samlpassword_script",
|
|
|
|
|
|
|
+ key="navmetadataservice_saml_password_script",
|
|
|
help=_t("Execute this script to produce the SAML password. This will be used when the plain password is not set."),
|
|
help=_t("Execute this script to produce the SAML password. This will be used when the plain password is not set."),
|
|
|
private=True,
|
|
private=True,
|
|
|
type=coerce_password_from_script,
|
|
type=coerce_password_from_script,
|