Merge branch 'doc_cookbook_uses_omnibus' into 'master'

 Drop comments on cookbook installing from source now that it uses Omnibus.

gitlab-coockbook now uses Omnibus packages so raketasks are invoked via gitlab-rake

See merge request !318

5 files changed, 17 insertions, 17 deletions

diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index f9d2f5dc4eb..50cd0d08b5a 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -13,7 +13,7 @@ You can only restore a backup to exactly the same version of GitLab that you cre
 # use this command if you've installed GitLab with the Omnibus package
 sudo gitlab-rake gitlab:backup:create
 
-# if you've installed GitLab from source or using the cookbook
+# if you've installed GitLab from source
 sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
 ```
 
@@ -147,7 +147,7 @@ You can only restore a backup to exactly the same version of GitLab that you cre
 # Omnibus package installation
 sudo gitlab-rake gitlab:backup:restore
 
-# installation from source or cookbook
+# installation from source
 bundle exec rake gitlab:backup:restore RAILS_ENV=production
 ```
 
@@ -192,7 +192,7 @@ Deleting tmp directories...[DONE]
 
 For Omnibus package installations, see https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md#scheduling-a-backup .
 
-For installation from source or cookbook:
+For installation from source:
 ```
 cd /home/git/gitlab
 sudo -u git -H editor config/gitlab.yml # Enable keep_time in the backup section to automatically delete old backups
diff --git a/doc/raketasks/cleanup.md b/doc/raketasks/cleanup.md
index 9e48f56c951..96d67f7b5d6 100644
--- a/doc/raketasks/cleanup.md
+++ b/doc/raketasks/cleanup.md
@@ -8,7 +8,7 @@ Remove namespaces(dirs) from `/home/git/repositories` if they don't exist in Git
 # omnibus-gitlab
 sudo gitlab-rake gitlab:cleanup:dirs
 
-# installation from source or cookbook
+# installation from source
 bundle exec rake gitlab:cleanup:dirs RAILS_ENV=production
 ```
 
@@ -18,6 +18,6 @@ Remove repositories (global only for now) from `/home/git/repositories` if they
 # omnibus-gitlab
 sudo gitlab-rake gitlab:cleanup:repos
 
-# installation from source or cookbook
+# installation from source
 bundle exec rake gitlab:cleanup:repos RAILS_ENV=production
 ```
diff --git a/doc/raketasks/maintenance.md b/doc/raketasks/maintenance.md
index 6f921bcdae5..41a994f3f68 100644
--- a/doc/raketasks/maintenance.md
+++ b/doc/raketasks/maintenance.md
@@ -8,7 +8,7 @@ This command gathers information about your GitLab installation and the System i
 # omnibus-gitlab
 sudo gitlab-rake gitlab:env:info
 
-# installation from source or cookbook
+# installation from source
 bundle exec rake gitlab:env:info RAILS_ENV=production
 ```
 
@@ -60,7 +60,7 @@ You may also have a look at our [Trouble Shooting Guide](https://github.com/gitl
 # omnibus-gitlab
 sudo gitlab-rake gitlab:check
 
-# installation from source or cookbook
+# installation from source
 bundle exec rake gitlab:check RAILS_ENV=production
 ```
 
diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md
index 3c67753ad28..80b01ca4043 100644
--- a/doc/raketasks/user_management.md
+++ b/doc/raketasks/user_management.md
@@ -6,7 +6,7 @@
 # omnibus-gitlab
 sudo gitlab-rake gitlab:import:user_to_projects[username@domain.tld]
 
-# installation from source or cookbook
+# installation from source
 bundle exec rake gitlab:import:user_to_projects[username@domain.tld] RAILS_ENV=production
 ```
 
@@ -20,7 +20,7 @@ Notes:
 # omnibus-gitlab
 sudo gitlab-rake gitlab:import:all_users_to_all_projects
 
-# installation from source or cookbook
+# installation from source
 bundle exec rake gitlab:import:all_users_to_all_projects RAILS_ENV=production
 ```
 
@@ -30,7 +30,7 @@ bundle exec rake gitlab:import:all_users_to_all_projects RAILS_ENV=production
 # omnibus-gitlab
 sudo gitlab-rake gitlab:import:user_to_groups[username@domain.tld]
 
-# installation from source or cookbook
+# installation from source
 bundle exec rake gitlab:import:user_to_groups[username@domain.tld] RAILS_ENV=production
 ```
 
@@ -44,6 +44,6 @@ Notes:
 # omnibus-gitlab
 sudo gitlab-rake gitlab:import:all_users_to_all_groups
 
-# installation from source or cookbook
+# installation from source
 bundle exec rake gitlab:import:all_users_to_all_groups RAILS_ENV=production
 ```
diff --git a/doc/raketasks/web_hooks.md b/doc/raketasks/web_hooks.md
index e1a58835d88..5a8b94af9b4 100644
--- a/doc/raketasks/web_hooks.md
+++ b/doc/raketasks/web_hooks.md
@@ -4,42 +4,42 @@
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:add URL="http://example.com/hook"
-    # source installations or cookbook
+    # source installations
     bundle exec rake gitlab:web_hook:add URL="http://example.com/hook" RAILS_ENV=production
 
 ## Add a web hook for projects in a given **NAMESPACE**:
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:add URL="http://example.com/hook" NAMESPACE=acme
-    # source installations or cookbook
+    # source installations
     bundle exec rake gitlab:web_hook:add URL="http://example.com/hook" NAMESPACE=acme RAILS_ENV=production
 
 ## Remove a web hook from **ALL** projects using:
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:rm URL="http://example.com/hook"
-    # source installations or cookbook
+    # source installations
     bundle exec rake gitlab:web_hook:rm URL="http://example.com/hook" RAILS_ENV=production
 
 ## Remove a web hook from projects in a given **NAMESPACE**:
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:rm URL="http://example.com/hook" NAMESPACE=acme
-    # source installations or cookbook
+    # source installations
     bundle exec rake gitlab:web_hook:rm URL="http://example.com/hook" NAMESPACE=acme RAILS_ENV=production
 
 ## List **ALL** web hooks:
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:list
-    # source installations or cookbook
+    # source installations
     bundle exec rake gitlab:web_hook:list RAILS_ENV=production
 
 ## List the web hooks from projects in a given **NAMESPACE**:
 
     # omnibus-gitlab
     sudo gitlab-rake gitlab:web_hook:list NAMESPACE=/
-    # source installations or cookbook
+    # source installations
     bundle exec rake gitlab:web_hook:list NAMESPACE=/ RAILS_ENV=production
 
 > Note: `/` is the global namespace.