Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
slapos
Commits
3e4c76cd
Commit
3e4c76cd
authored
Jan 12, 2017
by
iv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gitlab: Slapos'ify gitlab config updates
parent
b6022ed7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
software/gitlab/software.cfg
software/gitlab/software.cfg
+3
-3
software/gitlab/template/gitlab.yml.in
software/gitlab/template/gitlab.yml.in
+1
-1
software/gitlab/template/nginx.conf.in
software/gitlab/template/nginx.conf.in
+2
-2
software/gitlab/template/smtp_settings.rb.in
software/gitlab/template/smtp_settings.rb.in
+1
-1
No files found.
software/gitlab/software.cfg
View file @
3e4c76cd
...
@@ -315,7 +315,7 @@ md5sum = a9cb347f60aad3465932fd36cd4fe25d
...
@@ -315,7 +315,7 @@ md5sum = a9cb347f60aad3465932fd36cd4fe25d
[gitlab.yml.in]
[gitlab.yml.in]
<= download-template
<= download-template
md5sum =
176939a6428a7aca4767a36421b0af2b
md5sum =
9cdae35b959717cdef41cd4c57ccaeb9
[instance-gitlab.cfg.in]
[instance-gitlab.cfg.in]
<= download-file
<= download-file
...
@@ -335,7 +335,7 @@ md5sum = a11b50d2ff2b1fa842ba4aa20041e2fe
...
@@ -335,7 +335,7 @@ md5sum = a11b50d2ff2b1fa842ba4aa20041e2fe
[nginx.conf.in]
[nginx.conf.in]
<= download-template
<= download-template
md5sum =
1374f38ab6f295b850d45ea0019ec05d
md5sum =
66450929126921a8d757725020b7241f
[rack_attack.rb.in]
[rack_attack.rb.in]
<= download-template
<= download-template
...
@@ -347,7 +347,7 @@ md5sum = 7c89a730889e3224548d9abe51a2d719
...
@@ -347,7 +347,7 @@ md5sum = 7c89a730889e3224548d9abe51a2d719
[smtp_settings.rb.in]
[smtp_settings.rb.in]
<= download-template
<= download-template
md5sum =
c67ea492e17f774d0e18f1217338a55f
md5sum =
343c3f0c529b210ee773d3516124a505
[unicorn.rb.in]
[unicorn.rb.in]
<= download-template
<= download-template
...
...
software/gitlab/template/gitlab.yml.in
View file @
3e4c76cd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# see:
# see:
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/gitlab.yml.example
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
# (last updated for omnibus-gitlab 8
.8.9+ce.0-g25376053
)
# (last updated for omnibus-gitlab 8
-9-stable 5eb2711e
)
{% from 'macrolib.cfg.in' import cfg, cfg_https, external_url with context %}
{% from 'macrolib.cfg.in' import cfg, cfg_https, external_url with context %}
...
...
software/gitlab/template/nginx.conf.in
View file @
3e4c76cd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# see:
# see:
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/nginx/gitlab-ssl
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/nginx/gitlab-ssl
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/nginx.conf.erb
# (last updated for omnibus-gitlab 8
.8.9+ce.0-g25376053
)
# (last updated for omnibus-gitlab 8
-9-stable 5eb2711e
)
{% from 'macrolib.cfg.in' import cfg with context %}
{% from 'macrolib.cfg.in' import cfg with context %}
...
@@ -27,7 +27,7 @@ http {
...
@@ -27,7 +27,7 @@ http {
log_format gitlab_mattermost_access '<%= @gitlab_mattermost_access_log_format %>';
log_format gitlab_mattermost_access '<%= @gitlab_mattermost_access_log_format %>';
#}
#}
server_names_hash_bucket_size
<%= @server_names_hash_bucket_size %>
;
server_names_hash_bucket_size
{{ cfg('server_names_hash_bucket_size') }}
;
sendfile {{ cfg('nginx_sendfile') }};
sendfile {{ cfg('nginx_sendfile') }};
tcp_nopush {{ cfg('nginx_tcp_nopush') }};
tcp_nopush {{ cfg('nginx_tcp_nopush') }};
...
...
software/gitlab/template/smtp_settings.rb.in
View file @
3e4c76cd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# see:
# see:
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/smtp_settings.rb.sample
# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/smtp_settings.rb.sample
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
# (last updated for omnibus-gitlab 8
.8.9+ce.0-g25376053
)
# (last updated for omnibus-gitlab 8
-9-stable 5eb2711e
)
{% from 'macrolib.cfg.in' import cfg, cfg_bool with context %}
{% from 'macrolib.cfg.in' import cfg, cfg_bool with context %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment