From ee650d88ed09c8189aee40199905f6f8503287f9 Mon Sep 17 00:00:00 2001 From: Matthias Stecher Date: Sun, 15 Nov 2020 19:14:31 +0100 Subject: [PATCH] __nextcloud_{app,user}: Updated man cause of __nextcloud changes Also, the `gencode-remote` scripts where marked executeable. --- type/__nextcloud_app/gencode-remote | 0 type/__nextcloud_app/man.rst | 17 ++++++++++++----- type/__nextcloud_user/gencode-remote | 0 type/__nextcloud_user/man.rst | 19 +++++++++++++------ 4 files changed, 25 insertions(+), 11 deletions(-) mode change 100644 => 100755 type/__nextcloud_app/gencode-remote mode change 100644 => 100755 type/__nextcloud_user/gencode-remote diff --git a/type/__nextcloud_app/gencode-remote b/type/__nextcloud_app/gencode-remote old mode 100644 new mode 100755 diff --git a/type/__nextcloud_app/man.rst b/type/__nextcloud_app/man.rst index 2b13c5c..9074b03 100644 --- a/type/__nextcloud_app/man.rst +++ b/type/__nextcloud_app/man.rst @@ -75,22 +75,29 @@ EXAMPLES .. code-block:: sh - # nextcloud base installation - __nextcloud cloud $args + # Nextcloud base installation + __nextcloud /var/www/html/cloud $args # install the music app - require="__nextcloud/cloud" __nextcloud_app music \ + require="__nextcloud/var/www/html/cloud" __nextcloud_app music \ --cloud /var/www/html/cloud/ --state enabled # enable a shipped app (already installed) - require="__nextcloud/cloud" __nextcloud_app files_external \ + require="__nextcloud/var/www/html/cloud" __nextcloud_app files_external \ --cloud /var/www/html/cloud/ --state enabled # remove some app - require="__nextcloud/cloud" __nextcloud_app drawio \ + require="__nextcloud/var/www/html/cloud" __nextcloud_app drawio \ --cloud /var/www/html/cloud/ --state absent + # Different cloud + __nextcloud /var/www/html/nextcloud $args + # but same app name + require="__nextcloud/var/www/html/nextcloud" __nextcloud_user next_music \ + --cloud /var/www/html/nextcloud/ --appid music + + NOTES ----- Currently, it manages just if the app is installed and enabled. Further diff --git a/type/__nextcloud_user/gencode-remote b/type/__nextcloud_user/gencode-remote old mode 100644 new mode 100755 diff --git a/type/__nextcloud_user/man.rst b/type/__nextcloud_user/man.rst index f0ceff9..0b303d6 100644 --- a/type/__nextcloud_user/man.rst +++ b/type/__nextcloud_user/man.rst @@ -142,11 +142,11 @@ EXAMPLES .. code-block:: sh - # nextcloud base installation - __nextcloud cloud $args + # Nextcloud base installation + __nextcloud /var/www/html/cloud $args # setups an user, but do not touch it after it was created - require="__nextcloud/cloud" __nextcloud_user foo \ + require="__nextcloud/var/www/html/cloud" __nextcloud_user foo \ --cloud /var/www/html/cloud/ \ --displayname "Big Fooo" \ --email "foo@bar.tld" \ @@ -156,7 +156,7 @@ EXAMPLES --only-setup # manages an admin user fully controlled by cdist - require="__nextcloud/cloud" __nextcloud_user bar \ + require="__nextcloud/var/www/html/cloud" __nextcloud_user bar \ --cloud /var/www/html/cloud/ \ --displayname "Bar" \ --email "bar@bar.tld" \ @@ -164,7 +164,7 @@ EXAMPLES --group "admin" # disables an user - require="__nextcloud/cloud" __nextcloud_user bb \ + require="__nextcloud/var/www/html/cloud" __nextcloud_user bb \ --state disabled \ --cloud /var/www/html/cloud/ \ --displayname "byebye" \ @@ -172,11 +172,18 @@ EXAMPLES --keep-email --keep-password --keep-quota --keep-groups # removes an user - require="__nextcloud/cloud" __nextcloud_user foobar \ + require="__nextcloud/var/www/html/cloud" __nextcloud_user foobar \ --state absent \ --cloud /var/www/html/cloud/ + # Different cloud + __nextcloud /var/www/html/nextcloud $args + # but same user name + require="__nextcloud/var/www/html/nextcloud" __nextcloud_user next_foobar \ + --cloud /var/www/html/nextcloud/ --user foobar + + NOTES ----- This type may be extended by more user settings. If you think some