Commit ff517274 authored by David Nowell's avatar David Nowell
Browse files

Merge branch 'master' of gitlab.aws.vdc.it.umich.edu:its-inf-vdc/gitlab-role

parents 03f9f48f 63ecdf4a
......@@ -4,5 +4,7 @@
<description>For use in public areas. You do not trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted.</description>
<service name="http"/>
<service name="https"/>
<service name="ssh"/>
</zone>
......@@ -111,7 +111,7 @@ external_url 'https://{{ SERVNAME }}'
### Monitoring settings
###! IP whitelist controlling access to monitoring endpoints
# gitlab_rails['monitoring_whitelist'] = ['127.0.0.0/8']
gitlab_rails['monitoring_whitelist'] = ['192.231.253.0/24']
###! Time between sampling of unicorn socket metrics, in seconds
# gitlab_rails['monitoring_unicorn_sampler_interval'] = 10
......
Supports Markdown
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