diff --git a/conf/config.php b/conf/config.php index 1eb12c5..0773c50 100644 --- a/conf/config.php +++ b/conf/config.php @@ -4,9 +4,9 @@ return array( 'base_url' => 'https://__DOMAIN____PATH__', 'db' => array ( 'connection' => 'mysql', - 'dsn' => 'host=localhost;port=3306;dbname=__DB_USER__', - 'username' => '__DB_USER__', - 'password' => '__DB_PWD__', + 'dsn' => 'host=localhost;port=3306;dbname=__BD_NAME__', + 'username' => '__BD_NAME__', + 'password' => '__BD_PWD__', ), 'storage' => array( @@ -19,7 +19,7 @@ return array( 'schema' => 'ldap', 'host' => 'ldap://127.0.0.1', 'port' => 389, - 'base_domain' => 'dc=yunohost,dc=org', + 'base_domain' => 'dc=yunohost,dc=org', 'search_filter' => '(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))', 'user_domain' => 'ou=Users', 'rdn_attribute' => 'uid=', diff --git a/manifest.toml b/manifest.toml index 9034afe..e0de9d6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -48,7 +48,6 @@ ram.runtime = "50M" [resources.install_dir] [resources.data_dir] - #subdirs = ["storage"] [resources.permissions] main.url = "/" diff --git a/scripts/upgrade b/scripts/upgrade index 3bc3252..dd50215 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,7 +35,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Install database" --weight=1 pushd $install_dir - php$phpversion php/migrate --install + php$phpversion php/migrate php$phpversion php/clean popd