diff --git a/doc/installation.md b/doc/installation.md index b04a324d641d817f515bc0c114cfbc9076a3bcff..d3c7e3ae20346eb608903c8d9a83c6eb0986312f 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -77,6 +77,7 @@ Now install the required packages: sudo apt-get upgrade sudo apt-get install -y wget curl gcc checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libreadline6-dev libc6-dev libssl-dev libmysql++-dev make build-essential zlib1g-dev libicu-dev redis-server openssh-server git-core python-dev python-pip libyaml-dev postfix libpq-dev + sudo apt-get install -y python-pip libicu-dev libyaml-dev redis-server # required on Ubuntu-12.04 # Database @@ -121,7 +122,7 @@ Now install the required packages: # Quit from PostgreSQL server template1=# \q - # Try connect to new database + # Try connect to new database (do this later when user 'gitlab' has been created) $ su - gitlab $ psql -d gitlabhq_production -U gitlab @@ -180,8 +181,6 @@ Setup: sudo chmod 0444 /home/git/gitlab.pub sudo -u git -H sh -c "PATH=/home/git/bin:$PATH; gitolite setup -pk /home/git/gitlab.pub" - sudo -u git -H sed -i 's/0077/0007/g' /home/git/.gitolite.rc - sudo -u git -H sed -i "s/\(GIT_CONFIG_KEYS\s*=>*\s*\).\{2\}/\1'\.\*'/g" /home/git/.gitolite.rc Permissions: @@ -229,7 +228,7 @@ and ensure you have followed all of the above steps carefully. sudo -u gitlab cp config/database.yml.mysql config/database.yml # PostgreSQL - sudo -u gitlab cp config/database.yml.postgres config/database.yml + sudo -u gitlab cp config/database.yml.postgresql config/database.yml # make sure to update username/password in config/database.yml