Skip to content

Add parameters for Gitlab 8 #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexcern wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add parameters for Gitlab 8 #236

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8662ced
Add parameters for Gitlab 8
alexcern Oct 14, 2015
e2744f7
gitlab-git-http-server has just been renamed to gitlab-workhorse
alexcern Oct 28, 2015
f913dff
Better prepare for Gitlab 8.2 and gitlab-workhorse
alexcern Nov 2, 2015
ac2d946
Allow to customize nginx log path and options
alexcern Nov 9, 2015
3445602
Use mode 0750 for uploads folder, as expected by the check rake task
alexcern Nov 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

$socket_path = "${git_home}/gitlab/tmp/sockets/gitlab.socket"
$root_path = "${git_home}/gitlab/public"

if $gitlab_workhorse_branch {
$gitlab_workhorse_socket_path="${git_home}/gitlab/tmp/sockets/gitlab-workhorse.socket"
}

# gitlab
if $gitlab_manage_nginx {
Expand Down Expand Up @@ -41,7 +45,7 @@

file { '/etc/logrotate.d/gitlab':
ensure => file,
source => "${git_home}/gitlab/lib/support/logrotate/gitlab",
content => template('gitlab/gitlab_logrotate.erb'),
owner => root,
group => root,
mode => '0644';
Expand All @@ -52,13 +56,25 @@
"${git_home}/gitlab/tmp",
"${git_home}/gitlab/tmp/pids",
"${git_home}/gitlab/tmp/sockets",
"${git_home}/gitlab/public",
"${git_home}/gitlab/public/uploads",
"${git_home}/gitlab/public",
]:
ensure => directory,
mode => '0755',
}


#gitlab does not provide an option to configure the uploads directory location, so create a symlink to
#the desired folder if specified (otherwise, simply ensure the default uploads folder is there)
$gitlab_uploads_path_type = $gitlab_uploads_folder ? {
undef => 'directory',
default => 'link',
}
file { "${git_home}/gitlab/public/uploads":
ensure => $gitlab_uploads_path_type,
target => $gitlab_uploads_folder,
mode => '0755',
Copy link

@joshuaspence joshuaspence Nov 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that this is meant to be 0750. See https://github.com/gitlabhq/gitlabhq/blob/3f05c22f5612c26ff3707aa16eb0f3c8be18ec93/lib/tasks/gitlab/check.rake#L297

Copy link
Contributor Author

@alexcern alexcern Nov 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. The module was using 0755 until now, but changing to 0750 to pass rake check

force => true, #for the conversion to link
}

#gitlab does not provide an option to configure a log directory, so create a symlink to
#the desired folder if specified (otherwise, simply ensure the default log folder is there)
$gitlab_log_path_type = $gitlab_log_folder ? {
Expand Down
Loading