[DRE-commits] [gitlab] 03/05: update README.Debian

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab.

commit dfa945f1631764431d576b053f020fcd060dc9d0
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Mar 16 19:51:43 2016 +0530

    update README.Debian
---
 debian/README.Debian | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 1fb63e7..d2eecfe 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -48,13 +48,13 @@ Upstream documentation will instruct to run commands like the following:
     $ sudo -u gitlab -H bundle exec rake XXX RAILS_ENV=production
 
 Where is something like "db:migrate", "gitlab:check" or "gitlab:env:info". In
-Debian, the rake command has to be called by the gitlab user from its home
+Debian, the rake command has to be called by the gitlab user from app home
 directory /usr/share/gitlab and with the environment variables from
 /etc/gitlab/gitlab-debian.conf set. So above command could be run like:
 
     # su gitlab
     $ cd /usr/share/gitlab
-    $ export $(cat /etc/gitlab/gitlab-debian.conf | xargs)
+    $ export $(cat /etc/gitlab/gitlab-debian.conf)
     $ rake XXX RAILS_ENV=production
 
 One useful command to run in this environment is:
@@ -87,10 +87,8 @@ Migrating from non-Debian gitlab
  1. Rename your old database to gitlab_production and set the user gitlab as
     its owner and the owner of all its tables, sequences and views
  2. Copy your old repository directory to /var/lib/gitlab/repositories/
- 3. Copy your old public/uploads/ directory to /usr/share/gitlab/public/uploads/
- 4. Copy your old .ssh/authorized_keys to /usr/share/gitlab/.ssh/authorized_keys
-    and change the paths to gitlab-shell in your new copy of
-    .ssh/authorized_keys to /usr/share/gitlab-shell/bin/gitlab-shell
+ 3. Copy your old public/uploads/ directory to /var/lib/gitlab/public/uploads/
+ 4. Copy your old .ssh/authorized_keys to /var/lib/gitlab/.ssh/authorized_keys
  5. Start gitlab using `systemctl start gitlab.target`
  6. Check the status of your installation using gitlab:check (see section
     above). The output of that command will tell you the necessary remaining
@@ -107,7 +105,7 @@ Resetting admin password without web interface
 
     # su gitlab
     $ cd /usr/share/gitlab
-    $ export $(cat /etc/gitlab/gitlab-debian.conf | xargs)
+    $ export $(cat /etc/gitlab/gitlab-debian.conf)
     $ rails console production
     irb(main):001:0> user = User.where(admin: true).first
     irb(main):002:0> user.password = 'secret_pass'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git