Skip to content

Commit 028bf02

Browse files
authored
Merge pull request #11420 from bhugh/patch-1
2 parents 42c8e59 + 2318112 commit 028bf02

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

.github/workflows/check-occ-command.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
RST_FILE="$(find ./ -name '*.rst')"
2424
mapfile -t RST_FILE <<< "$RST_FILE"
2525
for file in "${RST_FILE[@]}"; do
26-
if [ "$(grep "php occ" "$file" | grep -v "sudo -E -u www-data php occ" | wc -l)" -gt 0 ]; then
26+
if [ "$(grep "php occ" "$file" | grep -v "sudo -E -u www-data php occ" | grep -v "docker" | wc -l)" -gt 0 ]; then
2727
printf "%b%s%b\n" "\e[0;31m" "$file does not use the 'sudo -E -u www-data php occ' syntax in some places which is required." "\e[0m"
28-
echo "See $(grep "php occ" "$file" | grep -v "sudo -E -u www-data php occ")"
28+
echo "See $(grep "php occ" "$file" | grep -v "sudo -E -u www-data php occ" | grep -v "docker")"
2929
FAIL=1
3030
fi
3131
done

admin_manual/configuration_files/external_storage_configuration_gui.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ on your network!
154154
.. figure:: external_storage/images/user_mounts.png
155155
:alt: Checkboxes to allow users to mount external storage services.
156156

157-
Adding files to external storages
158-
---------------------------------
157+
Adding files to external storage
158+
--------------------------------
159159

160160
We recommend configuring the background job **Webcron** or
161161
**Cron** (see :doc:`../configuration_server/background_jobs_configuration`)
@@ -170,3 +170,6 @@ You might need to setup a cron job that runs ``sudo -E -u www-data php occ files
170170
(or replace ``--all`` with the user name, see also :doc:`../occ_command`)
171171
to trigger a rescan of the user's files periodically (for example every 15 minutes), which includes
172172
the mounted external storage.
173+
174+
If you are running Nextcloud AIO, the equivalent command
175+
in that environment is ``sudo docker exec --user www-data -it nextcloud-aio-nextcloud php occ files:scan --all``.

0 commit comments

Comments
 (0)