Merge branch...

Merge branch '325286-write-documentation-for-running-gitlab-pages-without-nfs-in-beta' into 'master'

Document disabling pages local_store

See merge request gitlab-org/gitlab!59980

doc/administration/pages/index.md

@@ -864,13 +864,6 @@ configuration is tried to be resolved automatically before reporting an error.
 
 ### Object storage settings
 
-WARNING:
-With the following settings, Pages uses both NFS and Object Storage locations when deploying the
-site. **Do not remove the existing NFS mount used by Pages** when applying these settings. For more
-information, see the epics
-[3901](https://gitlab.com/groups/gitlab-org/-/epics/3901#how-to-test-object-storage-integration-in-beta)
-and [3910](https://gitlab.com/groups/gitlab-org/-/epics/3910).
-
 The following settings are:
 
 - Nested under `pages:` and then `object_store:` on source installations.
@@ -882,6 +875,10 @@ The following settings are:
 | `remote_directory` | The name of the bucket where Pages site content is stored. | |
 | `connection` | Various connection options described below. | |
 
+NOTE:
+If you want to stop using and disconnect the NFS server, you need to [explicitly disable
+local storage](#disable-pages-local-storage), and it's only possible after upgrading to GitLab 13.11.
+
 #### S3-compatible connection settings
 
 See [the available connection settings for different providers](../object_storage.md#connection-settings).
@@ -1019,6 +1016,22 @@ After the migration to object storage is performed, you can choose to revert you
 sudo gitlab-rake gitlab:pages:deployments:migrate_to_local
 ```
 
+### Disable Pages local storage
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/301159) in GitLab 13.11.
+
+If you use [object storage](#using-object-storage), disable local storage:
+
+1. Edit `/etc/gitlab/gitlab.rb`:
+
+   ```ruby
+   gitlab_rails['pages_local_store_enabled'] = false
+   ```
+
+1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
+
+Starting from GitLab 13.12, this setting also disables the [legacy storage](#migrate-legacy-storage-to-zip-storage), so if you were using NFS to serve Pages, you can completely disconnect from it.
+
 ## Backup
 
 GitLab Pages are part of the [regular backup](../../raketasks/backup_restore.md), so there is no separate backup to configure.