feat: oc11 to support docker only deployments

global-attributes.yml

@@ -36,8 +36,7 @@
     oc-examples-username: 'username'
     oc-examples-password: 'password'
     oc-complete-name: 'owncloud-complete-latest'
-    occ-command-example-prefix: 'sudo -u www-data ./occ'
-    occ-command-example-prefix-no-sudo: 'occ'
+    occ-command-example-prefix: 'occ'
     php-net-url: 'https://www.php.net'
     php-supported-versions-url: 'https://www.php.net/supported-versions.php'
     http-status-codes-base-url: 'https://developer.mozilla.org/en-US/docs/Web/HTTP/Status'

modules/admin_manual/pages/configuration/database/linux_database_configuration.adoc

@@ -185,6 +185,8 @@ innodb_file_per_table=ON
 {occ-command-example-prefix} db:convert-mysql-charset
 ----
 +
+NOTE: Run this command inside the ownCloud Docker container.
++
 When this is done, tables will be created with:
 +
 * A `utf8mb4` character set.

modules/admin_manual/pages/configuration/files/encryption/encryption_configuration.adoc

@@ -123,11 +123,15 @@ To enable the encryption app, run the following command:
 {occ-command-example-prefix} app:enable encryption
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} encryption:enable
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 If the encryption app is successfully enabled, you should see the following confirmations:
 
 [source,plaintext]
@@ -165,27 +169,35 @@ To be safe and avoid any issues on a running instance, put your server in single
 {occ-command-example-prefix} maintenance:singleuser --on
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 Enabling encryption via the command line involves several commands. If not already done, enable the default encryption module app with the following command:
 
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} app:enable encryption
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 Then enable encryption, using the following command:
 
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} encryption:enable
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 Finally, encrypt all data, using the following command:
 
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} encryption:encrypt-all --yes
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 NOTE: This command is not typically required as the master key is often enabled at installation time. As a result when enabling it, there should be no data to encrypt. In case it’s being enabled after the installation and there are files which are unencrypted, xref:configuration/server/occ_command.adoc#encrypt-all[encrypt-all] can be used to encrypt them. Depending on the amount of existing data and the location, this operation can take a long time.
 
 Now you can turn off the single user mode:
@@ -195,6 +207,8 @@ Now you can turn off the single user mode:
 {occ-command-example-prefix} maintenance:singleuser --off
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 === View Current Encryption Status
 
 Get the current encryption status and the loaded encryption module:
@@ -204,6 +218,8 @@ Get the current encryption status and the loaded encryption module:
 {occ-command-example-prefix} encryption:status
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 === Replacing an Existing Master Key
 
 If the master key needs replacement, for example because it has been compromised, an occ command is available. The command is xref:configuration/server/occ_command.adoc#encryption[encryption:recreate-master-key]. It replaces an existing master key with a new one and encrypts the files with the new key.
@@ -217,6 +233,8 @@ You must first put your ownCloud server into single-user mode to prevent any use
 {occ-command-example-prefix} maintenance:singleuser --on
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 [source,plaintext]
 ----
 Single user mode is currently enabled
@@ -229,6 +247,8 @@ Decrypt all user data files, or optionally a single user:
 {occ-command-example-prefix} encryption:decrypt-all [username]
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 === Disable Encryption
 
 To disable encryption, put your ownCloud server into single-user mode, and then disable your encryption module with these commands:
@@ -238,18 +258,24 @@ To disable encryption, put your ownCloud server into single-user mode, and then
 {occ-command-example-prefix} maintenance:singleuser --on
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} encryption:disable
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 Take it out of single-user mode when you are finished, by using the following command:
 
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} maintenance:singleuser --off
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 [IMPORTANT]
 ====
 You may only disable encryption by using the xref:configuration/server/occ_command.adoc#encryption[occ Encryption Commands]. Make sure you have backups of all encryption keys, including those for all your users if user key encryption was selected.
@@ -264,6 +290,8 @@ Get the current encryption status and the loaded encryption module:
 {occ-command-example-prefix} encryption:status
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 === Enable Users' File Recovery Keys
 
 If users encrypt their files and lose their ownCloud password, they lose access to their encrypted files as the files will be unrecoverable. It is not possible to reset a user’s password using the standard reset process if the user's files are encrypted.
@@ -315,6 +343,8 @@ You must first put your ownCloud server into single-user mode to prevent any use
 {occ-command-example-prefix} maintenance:singleuser --on
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 [source,plaintext]
 ----
 Single user mode is currently enabled
@@ -329,11 +359,15 @@ You may disable encryption only with `occ`. Make sure you have backups of all th
 {occ-command-example-prefix} maintenance:singleuser --on
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} encryption:disable
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 IMPORTANT: Encryption cannot be disabled without the user’s password or
 xref:enable-users-file-recovery-keys[file recovery key].
 If you don’t have access to at least one of these then there is no way to decrypt all files.
@@ -345,6 +379,8 @@ command:
 {occ-command-example-prefix} maintenance:singleuser --off
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 It is possible to disable encryption with the file recovery key _if_ every user has enabled it. In this case, "decrypt all" will decrypt all files of all users.
 
 NOTE: It is *not* planned to move this to the next user login or a background job. If that was done, then login passwords would need to be stored in the database, which could be a security issue.
@@ -358,6 +394,8 @@ View current location of keys:
 {occ-command-example-prefix} encryption:show-key-storage-root
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 [source,plaintext]
 ----
 Current key storage root:  default storage location (data/)
@@ -385,6 +423,8 @@ chmod -R 0770 /var/www/owncloud/data/new_keys
 {occ-command-example-prefix} encryption:change-key-storage-root new_keys
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 [source,plaintext]
 ----
 Change key storage root from default storage location to new_keys

modules/admin_manual/pages/configuration/files/encryption/encryption_configuration_quick_guide.adoc

@@ -24,13 +24,17 @@ This quick guide gives a brief summary of the commands needed without going into
 {occ-command-example-prefix} maintenance:singleuser --off
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 === View the Encryption Status
 
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} encryption:status
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 === Decrypt Encrypted Files
 
 Depending on the amount of existing data, this operation can take a long time.
@@ -42,6 +46,8 @@ Depending on the amount of existing data, this operation can take a long time.
 {occ-command-example-prefix} maintenance:singleuser --off
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 === Deactivate Master-Key-Based Encryption
 
 [source,bash,subs="attributes+"]
@@ -52,13 +58,17 @@ Depending on the amount of existing data, this operation can take a long time.
 {occ-command-example-prefix} app:disable encryption
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 If the master key has been compromised or exposed, you can replace it. You will need the current master key for it.
 
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} encryption:recreate-master-key
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 == Clean up Your Database
 
 Access your ownCloud database and remove the remaining entries that have not been automatically removed with this command:

modules/admin_manual/pages/configuration/files/external_storage/configuration.adoc

@@ -101,7 +101,7 @@ TIP: Please refer to xref:configuration/server/import_ssl_cert.adoc[Importing Sy
 The following backends are provided by the external storages app. Other
 apps may provide their own backends, which are not listed here.
 
-NOTE: A non-blocking or correctly configured SELinux setup is needed for these backends to work. Please refer to xref:installation/selinux_configuration.adoc[the SELinux configuration].
+NOTE: A non-blocking or correctly configured SELinux setup is needed for these backends to work.
 
 == Allow Users to Mount External Storage
 
@@ -137,6 +137,8 @@ You might need to setup a cron job that runs
 {occ-command-example-prefix} files:scan --all`
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 * Alternatively, replace `--all` with the user name to trigger a rescan of the user’s files periodically,
 for example every 15 minutes, which includes the mounted external storage.
 +

modules/admin_manual/pages/configuration/files/federated_cloud_sharing_configuration.adoc

@@ -36,6 +36,8 @@ image::configuration/files/browser-address-bars.png[Lock icon in Firefox, Google
 ----
 {occ-command-example-prefix} system:cron
 ----
++
+NOTE: Run this command inside the ownCloud Docker container.
 
 . Run the `OCA\Federation\SyncJob` job with the `force` option on both servers. +
 You can get the corresponding job ID by using the `background:queue:status` occ command:
@@ -44,6 +46,8 @@ You can get the corresponding job ID by using the `background:queue:status` occ
 ----
 {occ-command-example-prefix} background:queue:execute --force <jobId>
 ----
++
+NOTE: Run this command inside the ownCloud Docker container.
 
 . The check should now be green
 
@@ -54,6 +58,8 @@ You can get the corresponding job ID by using the `background:queue:status` occ
 {occ-command-example-prefix} dav:sync-system-addressbook
 {occ-command-example-prefix} federation:sync-addressbook
 ----
++
+NOTE: Run this command inside the ownCloud Docker container.
 
 . Configure automatic acceptance of new federated shares
 +
@@ -65,6 +71,8 @@ NOTE: Automatic acceptance of new federated shares will not work if the option `
 {occ-command-example-prefix} config:app:set federation auto_accept_trusted --value '0'
 {occ-command-example-prefix} config:app:set federatedfilesharing auto_accept_trusted --value 'yes'
 ----
+
+NOTE: Run this command inside the ownCloud Docker container.
 --
 
 == Working With Proxies
@@ -117,6 +125,8 @@ Alternatively you can use the command line:
 {occ-command-example-prefix} config:app:set files_sharing cronjob_scan_external_enabled --value 'yes'
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 You can also configure these settings of the cronjob:
 
 . the minimum amount of time since last login of a user so that a scan is triggered (ensures only active users get fed shares synced)
@@ -125,27 +135,35 @@ You can also configure these settings of the cronjob:
 ----
 {occ-command-example-prefix} config:app:set files_sharing cronjob_scan_external_min_login --value <integer-seconds>
 ----
++
+NOTE: Run this command inside the ownCloud Docker container.
 
 . the minimum amount of time since last scanned so that the next scan is triggered (avoid frequent scan when active collaboration)
 +
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} config:app:set files_sharing cronjob_scan_external_min_scan --value <integer-seconds>
 ----
++
+NOTE: Run this command inside the ownCloud Docker container.
 
 . the maximum number of federated share scans per 10 minutes (scan performed only if fed share files got updated)
 +
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} config:app:set files_sharing cronjob_scan_external_batch --value <integer-number>
 ----
++
+NOTE: Run this command inside the ownCloud Docker container.
 
 . Use the following command to force a run of the scanner cronjob:
 +
 [source,bash,subs="attributes+"]
 ----
 {occ-command-example-prefix} background:queue:execute --force --accept-warning <id-of-fed-scanner-job>
 ----
++
+NOTE: Run this command inside the ownCloud Docker container.
 
 == Known Issues
 
@@ -173,6 +191,8 @@ It is possible to configure the VCARD properties that are searched in order to r
 {occ-command-example-prefix} config:app:set dav remote_search_properties --value=CLOUD,FN,EMAIL
 ----
 
+NOTE: Run this command inside the ownCloud Docker container.
+
 Possible values are:
 
 * VERSION