Update doc and gitlab.rb template.

README.md

@@ -515,10 +515,14 @@ See [doc/settings/nginx.md](doc/settings/nginx.md).
 To create a backup of your repositories and GitLab metadata, run the following command.
-__Note that GitLab CI currently does not have a backup script.__
-
 ```shell
-sudo gitlab-rake gitlab:backup:create
+gitlab-rake gitlab:backup:create
+```
+
+For GitLab CI run:
+
+```
+gitlab-ci-rake backup:create
 ```
 This will store a tar file in `/var/opt/gitlab/backups`. The filename will look like

files/gitlab-config-template/gitlab.rb.template

@@ -431,6 +431,19 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_ci['gravatar_plain_url'] = "http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm"
 # gitlab_ci['gravatar_ssl_url'] =  "https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm"
+## For setting up backups
+## see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/629def0a7a26e7c2326566f0758d4a27857b52a3/README.md#backups
+
+# gitlab_ci['backup_path'] = "/var/opt/gitlab/backups"
+# gitlab_ci['backup_keep_time'] = 604800
+# gitlab_ci['backup_upload_connection'] = {
+#   'provider' => 'AWS',
+#   'region' => 'eu-west-1',
+#   'aws_access_key_id' => 'AKIAKIAKI',
+#   'aws_secret_access_key' => 'secret123'
+# }
+# gitlab_ci['backup_upload_remote_directory'] = 'my.s3.bucket'
+
 ###############################
 # GitLab CI database settings #
 ###############################