diff --git a/manifest.toml b/manifest.toml index f418fd9..a92b7d1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -35,7 +35,7 @@ ram.runtime = "250M" # this is a generic question - ask strings are automatically handled by YunoHost's core type = "domain" - [install.init_main_permission] + [install.admin] help.en = "Choose the user who can access to silverbullet" help.fr = "Choisissez l'utilisateur pouvant accéder à silverbullet" type = "user" @@ -57,10 +57,10 @@ ram.runtime = "250M" [resources.install_dir] [resources.data_dir] + subdirs = [ "notes" ] [resources.permissions] main.url = "/" - main.permissions = "visitors" # The app is protected by a user/password prompt [resources.ports] main.default = 3000 diff --git a/scripts/install b/scripts/install index e275215..15653a0 100755 --- a/scripts/install +++ b/scripts/install @@ -35,8 +35,10 @@ ynh_add_config --template="custom.env" --destination="$data_dir/custom.env" chmod 600 "$data_dir/custom.env" chown "$app:$app" "$data_dir/custom.env" -# Create notes subdir -install -d -m 700 -o $app -g $app $data_dir/notes +#================================================= +# SET PERMISSION FOR THE USER +#================================================= +ynh_permission_update --permission="main" --add="$admin" #================================================= # SYSTEM CONFIGURATION diff --git a/scripts/restore b/scripts/restore index 8209a2f..15186a9 100755 --- a/scripts/restore +++ b/scripts/restore @@ -41,6 +41,8 @@ systemctl enable "$app.service" --quiet yunohost service add "$app" --description="The hacker's notebook" +ynh_permission_update --permission="main" --add="$admin" + #================================================= # RELOAD NGINX AND PHP-FPM OR THE APP SERVICE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index bb37a89..42d0b9c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,8 +40,10 @@ ynh_add_config --template="custom.env" --destination="$data_dir/custom.env" chmod 600 "$data_dir/custom.env" chown "$app:$app" "$data_dir/custom.env" -# Create notes subdir -install -d -m 700 -o $app -g $app $data_dir/notes +#================================================= +# SET PERMISSION FOR THE USER +#================================================= +ynh_permission_update --permission="main" --add="$admin" #================================================= # REAPPLY SYSTEM CONFIGURATIONS diff --git a/tests.toml b/tests.toml index 0299d95..e003427 100644 --- a/tests.toml +++ b/tests.toml @@ -4,9 +4,6 @@ test_format = 1.0 [default] - exclude = ["install.subdir"] - args.init_main_permission = "package_checker" - # ------------------------------- # Commits to test upgrade from # -------------------------------