diff --git a/conf/local.config.php b/conf/local.config.php index 6956136..131d5d1 100644 --- a/conf/local.config.php +++ b/conf/local.config.php @@ -30,20 +30,6 @@ return [ 'Omeka\File\Thumbnailer' => 'Omeka\File\Thumbnailer\ImageMagick', ], ], - 'ldap' => [ - 'adapter_options' => [ - 'server1' => [ - 'host' => 'localhost', - 'username' => 'ou=users,dc=yunohost,dc=org', - 'password' => null, - 'bindRequiresDn' => true, - 'baseDn' => 'ou=users,dc=yunohost,dc=org', - 'accountFilterFormat' => "(&(|(objectclass=posixAccount))(uid={{username}})(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))", - 'accountCanonicalForm' => 4, - #'accountDomainName' => 'example.com', - ], - ], - ], 'mail' => [ 'transport' => [ 'type' => 'smtp', @@ -53,8 +39,8 @@ return [ 'port' => 25, // 465 for 'ssl', and 587 for 'tls' 'connection_class' => 'smtp', // 'plain', 'login', or 'crammd5' 'connection_config' => [ - 'username' => null, - 'password' => null, + 'username' => '__APP__', + 'password' => '__MAIL_PWD__', 'ssl' => null, // 'ssl' or 'tls' 'use_complete_quit' => true, ], diff --git a/manifest.toml b/manifest.toml index aeb7787..bc99c1c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -67,6 +67,7 @@ ram.runtime = "50M" [resources.system_user] [resources.install_dir] + allow_email = true [resources.permissions] main.url = "/" @@ -76,7 +77,7 @@ ram.runtime = "50M" api.show_tile = false [resources.apt] - packages = "mariadb-server, imagemagick, php8.3-mysql, php8.3-gd, php8.3-mbstring, php8.3-xml, php8.3-ldap, php8.3-imagick" + packages = "mariadb-server, imagemagick, php8.3-mysql, php8.3-gd, php8.3-mbstring, php8.3-xml, php8.3-imagick" [resources.database] type = "mysql" diff --git a/scripts/install b/scripts/install index dfd5ad2..92b9603 100755 --- a/scripts/install +++ b/scripts/install @@ -32,7 +32,6 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir/modules/" --source_id="csvimport" -ynh_setup_source --dest_dir="$install_dir/modules/" --source_id="ldap" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" diff --git a/scripts/upgrade b/scripts/upgrade index f8840f9..77adcef 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,7 +40,6 @@ ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --keep="config/local.config.php config/database.ini modules themes files" ynh_setup_source --dest_dir="$install_dir/modules/" --source_id="csvimport" -ynh_setup_source --dest_dir="$install_dir/modules/" --source_id="ldap" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"