tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Frontend and configure.ac fixes 

refs #4491
This commit is contained in:
Jannis Moßhammer 2013-08-26 16:54:23 +02:00
parent 81b41326cc
commit c5dca9062b
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -2444,7 +2444,7 @@ fi
if test "${with_ldap_binddn+set}" = set; then : if test "${with_ldap_binddn+set}" = set; then :
withval=$with_ldap_binddn; ldap_binddn=$withval withval=$with_ldap_binddn; ldap_binddn=$withval
else else
ldap_binddn="cn=Manager, ou=icinga, ou=org" ldap_binddn="cn=admin,cn=config"
fi fi
@ -2454,7 +2454,7 @@ fi
if test "${with_ldap_bindpass+set}" = set; then : if test "${with_ldap_bindpass+set}" = set; then :
withval=$with_ldap_bindpass; ldap_bindpass=$withval withval=$with_ldap_bindpass; ldap_bindpass=$withval
else else
ldap_bindpass="secret" ldap_bindpass="admin"
fi fi
@ -2966,7 +2966,7 @@ fi
# #
# Create config files # Create config files
# #
ac_config_files="$ac_config_files Makefile config/authentication.ini config/resources.ini config/modules/monitoring/backends.ini etc/apache/icingaweb.conf public/index.php" ac_config_files="$ac_config_files Makefile config/authentication.ini config/resources.ini config/modules/monitoring/backends.ini etc/apache/icingaweb.conf"
# #
@ -3683,7 +3683,6 @@ do
"config/resources.ini") CONFIG_FILES="$CONFIG_FILES config/resources.ini" ;; "config/resources.ini") CONFIG_FILES="$CONFIG_FILES config/resources.ini" ;;
"config/modules/monitoring/backends.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/backends.ini" ;; "config/modules/monitoring/backends.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/backends.ini" ;;
"etc/apache/icingaweb.conf") CONFIG_FILES="$CONFIG_FILES etc/apache/icingaweb.conf" ;; "etc/apache/icingaweb.conf") CONFIG_FILES="$CONFIG_FILES etc/apache/icingaweb.conf" ;;
"public/index.php") CONFIG_FILES="$CONFIG_FILES public/index.php" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac esac

5
configure.ac
View File

@ -154,13 +154,13 @@ AC_ARG_WITH([ldap_port],
AC_ARG_WITH([ldap_binddn], AC_ARG_WITH([ldap_binddn],
AS_HELP_STRING([--with-ldap-binddn=DN], [dn to use for retrieving user information via ldap (default cn=admin, cn=config)]), AS_HELP_STRING([--with-ldap-binddn=DN], [dn to use for retrieving user information via ldap (default cn=admin, cn=config)]),
ldap_binddn=$withval, ldap_binddn=$withval,
ldap_binddn=["cn=Manager, ou=icinga, ou=org"] ldap_binddn=["cn=admin,cn=config"]
) )
AC_ARG_WITH([ldap_bindpass], AC_ARG_WITH([ldap_bindpass],
AS_HELP_STRING([--with-ldap-bindpass=PASS], [password to use for retrieving user information via ldap (default admin)]), AS_HELP_STRING([--with-ldap-bindpass=PASS], [password to use for retrieving user information via ldap (default admin)]),
ldap_bindpass=$withval, ldap_bindpass=$withval,
ldap_bindpass=["secret"] ldap_bindpass=["admin"]
) )
AC_ARG_WITH([ldap_rootdn], AC_ARG_WITH([ldap_rootdn],
@ -483,7 +483,6 @@ AC_CONFIG_FILES([
config/resources.ini config/resources.ini
config/modules/monitoring/backends.ini config/modules/monitoring/backends.ini
etc/apache/icingaweb.conf etc/apache/icingaweb.conf
public/index.php
]) ])
# #

7
test/frontend/icingawebtest.js
View File

@ -107,6 +107,13 @@ if (path === null) {
'password' : pass 'password' : pass
}; };
}; };
exports.performLogin = function() {
casper.open("/authentication/logou", function() {
this.fill('form#login', icinga.getCredentials());
this.click('form#login input#submit');
});
};
})(); })();