mirror of
https://github.com/YunoHost-Apps/kimai2_ynh.git
synced 2024-09-03 19:26:26 +02:00
Fix
This commit is contained in:
parent
6fbf09c43e
commit
963dae7041
2 changed files with 5 additions and 7 deletions
|
@ -112,12 +112,12 @@ kimai:
|
||||||
attributes:
|
attributes:
|
||||||
# The following 2 rules are automatically prepended and can be overwritten.
|
# The following 2 rules are automatically prepended and can be overwritten.
|
||||||
# Username is set to the value of the configured "usernameAttribute" field
|
# Username is set to the value of the configured "usernameAttribute" field
|
||||||
- { ldap_attr: "uid", user_method: "setUsername" }
|
- { ldap_attr: "uid", user_method: setUsername }
|
||||||
# Only applied if you don't configure a mapping for setEmail()
|
# Only applied if you don't configure a mapping for setEmail()
|
||||||
- { ldap_attr: "mail", user_method: "setEmail" }
|
- { ldap_attr: "mail", user_method: setEmail }
|
||||||
# An example which will set the display name in Kimai from the
|
# An example which will set the display name in Kimai from the
|
||||||
# value of the "common name" field in your LDAP
|
# value of the "common name" field in your LDAP
|
||||||
- { ldap_attr: "cn", user_method: "setAlias" }
|
- { ldap_attr: "cn", user_method: setAlias }
|
||||||
|
|
||||||
# You can comment the following section, if you don't want to manage
|
# You can comment the following section, if you don't want to manage
|
||||||
# user roles in Kimai via LDAP groups. If you want to use the group
|
# user roles in Kimai via LDAP groups. If you want to use the group
|
||||||
|
@ -135,8 +135,8 @@ kimai:
|
||||||
# The following example rule will be expanded to (for user "foo"):
|
# The following example rule will be expanded to (for user "foo"):
|
||||||
# (&(&(objectClass=groupOfNames))(member=foo))
|
# (&(&(objectClass=groupOfNames))(member=foo))
|
||||||
# default: empty
|
# default: empty
|
||||||
filter: "(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))"
|
filter: "(&(objectClass=posixGroup)(cn=__APP__*))"
|
||||||
|
|
||||||
# The following field is taken from the LDAP user entry and its
|
# The following field is taken from the LDAP user entry and its
|
||||||
# value is used in the filter above as "valueOfUsernameAttribute".
|
# value is used in the filter above as "valueOfUsernameAttribute".
|
||||||
# The attribute must be given in lowercase!
|
# The attribute must be given in lowercase!
|
||||||
|
|
|
@ -30,7 +30,6 @@ is_public=$YNH_APP_ARG_IS_PUBLIC
|
||||||
registration=$YNH_APP_ARG_REGISTRATION
|
registration=$YNH_APP_ARG_REGISTRATION
|
||||||
random_key=$(ynh_string_random 32)
|
random_key=$(ynh_string_random 32)
|
||||||
phpversion=$YNH_PHP_VERSION
|
phpversion=$YNH_PHP_VERSION
|
||||||
email=$(ynh_user_get_info --username=$admin --key=mail)
|
|
||||||
|
|
||||||
app=$YNH_APP_INSTANCE_NAME
|
app=$YNH_APP_INSTANCE_NAME
|
||||||
|
|
||||||
|
@ -174,7 +173,6 @@ ynh_script_progression --message="Installing Kimai2..."
|
||||||
|
|
||||||
pushd "$final_path"
|
pushd "$final_path"
|
||||||
ynh_exec_as $app php$phpversion bin/console kimai:install -n
|
ynh_exec_as $app php$phpversion bin/console kimai:install -n
|
||||||
ynh_exec_as $app php$phpversion bin/console kimai:create-user $admin $email ROLE_SUPER_ADMIN -n
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
Loading…
Add table
Reference in a new issue