Commit 6db98533 authored by Marin Jankovski's avatar Marin Jankovski

Change a couple of steps with development setup.

parent 7fd37b4f
......@@ -6,13 +6,13 @@
To develop GitLab, it is recommended to install a development GitLab on metal. This is much faster than any VM-based setup, but has as disadvantage that you might have to deal with anything that is already on your system.
*Please read the whole document including the troubleshooting and limitations section before starting the setup as it can alter your system installation.*
This guide is tested and confirmed working on:
* Ubuntu 13.10
* Please send merge request to add other OS's you've tested it on.
*Please read the whole document including the troubleshooting and limitations section before starting the setup.*
The installation process is almost the same as a [production install using Chef](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/doc/production.md).
You use the same `/tmp/solo.rb` as mentioned in the production install.
......@@ -31,6 +31,7 @@ cat > /tmp/solo.json << EOF
{
"gitlab": {
"env": "development",
"compile_ruby": false,
"repos_path": "/home/USER/repositories",
"shell_path": "/home/USER/gitlab-shell",
"ssh_port": "22",
......@@ -43,9 +44,7 @@ cat > /tmp/solo.json << EOF
"run_list": [
"postfix",
"gitlab::packages",
"gitlab::database_postgresql",
"gitlab::deploy"
"gitlab::default"
]
}
......
......@@ -190,9 +190,6 @@ ruby_block "Copy from example gitlab init config" do
resource.content IO.read(File.join(gitlab['path'], "lib", "support", "init.d", "gitlab"))
resource.mode 0755
resource.run_action :create
if resource.updated? && gitlab['env'] == 'production'
self.notifies :run, resources(:execute => "set gitlab to start on boot"), :immediately
end
end
end
......@@ -207,16 +204,6 @@ end
case gitlab['env']
when 'production'
# Updates defaults so gitlab can boot on start. As per man pages of update-rc.d runs only if links do not exist
execute "set gitlab to start on boot" do
if platform_family?("debian")
command "update-rc.d gitlab defaults 21"
else
command "chkconfig --level 21 gitlab on"
end
action :nothing
end
## Setup logrotate
# Creating the file this way for the following reasons
# 1. Chef 11.4.0 must be used to keep support for AWS OpsWorks
......
......@@ -8,7 +8,7 @@ gitlab = node['gitlab']
## Start Your GitLab Instance
service "gitlab" do
supports :start => true, :stop => true, :restart => true, :reload => true, :status => true
action :enable
action gitlab['env'] == "production" ? :enable : :nothing
end
service "gitlab" do
......
......@@ -26,6 +26,9 @@ user gitlab['user'] do
supports :manage_home => true
end
user gitlab['user'] do
action :lock
# Locking user is not needed in development
if gitlab['env'] == 'production'
user gitlab['user'] do
action :lock
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment