Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

puppet: Support FQDNs in puppet zulip.conf names.

This commit is contained in:
Alex Vandiver 2022-11-01 15:01:00 -04:00 committed by Tim Abbott
parent df201bd132
commit e05a0dcf98
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
puppet/zulip_ops/templates/nagios4/hosts.cfg.template.erb
View File

@ -3,7 +3,7 @@ define host{
use generic-host
host_name <%= host %>
alias <%= host %>
address <%= host %>
address <%= host %><% unless host.include?(".") %>.<%= @default_host_domain %><% end %>
hostgroups all,fullstack,non_aws_host,frontends,not_pageable_servers,postgresql
}
<% end -%>
@ -13,7 +13,7 @@ define host{
use generic-host
host_name <%= host %>
alias <%= host %>
address <%= host %>.<%= @default_host_domain %>
address <%= host %><% unless host.include?(".") %>.<%= @default_host_domain %><% end %>
hostgroups all,aws_host,prod_frontends,pageable_servers
}
<% end -%>
@ -23,7 +23,7 @@ define host{
use generic-host
host_name <%= host %>
alias <%= host %>
address <%= host %>.<%= @default_host_domain %>
address <%= host %><% unless host.include?(".") %>.<%= @default_host_domain %><% end %>
hostgroups all,aws_host,staging_frontends,not_pageable_servers
}
<% end -%>
@ -33,7 +33,7 @@ define host{
use generic-host
host_name <%= host %>
alias <%= host %>
address <%= host %>.<%= @default_host_domain %>
address <%= host %><% unless host.include?(".") %>.<%= @default_host_domain %><% end %>
hostgroups all,non_aws_host,zmirror,flaky_servers
}
<% end -%>
@ -43,7 +43,7 @@ define host{
use generic-host
host_name <%= host %>
alias <%= host %>
address <%= host %>.<%= @default_host_domain %>
address <%= host %><% unless host.include?(".") %>.<%= @default_host_domain %><% end %>
hostgroups all,non_aws_host,zmirrorp,flaky_servers
}
<% end -%>
@ -53,7 +53,7 @@ define host{
use generic-host
host_name <%= host %>
alias <%= host %>
address <%= host %>.<%= @default_host_domain %>
address <%= host %><% unless host.include?(".") %>.<%= @default_host_domain %><% end %>
hostgroups all,aws_host,postgresql_primary,pageable_servers
}
<% end -%>
@ -63,7 +63,7 @@ define host{
use generic-host
host_name <%= host %>
alias <%= host %>
address <%= host %>.<%= @default_host_domain %>
address <%= host %><% unless host.include?(".") %>.<%= @default_host_domain %><% end %>
hostgroups all,aws_host,postgresql_replica,pageable_servers
}
<% end -%>
@ -73,7 +73,7 @@ define host{
use generic-host
host_name <%= host %>
alias <%= host %>
address <%= host %>.<%= @default_host_domain %>
address <%= host %><% unless host.include?(".") %>.<%= @default_host_domain %><% end %>
hostgroups all,aws_host,not_pageable_servers, redis
}
<% end -%>
@ -83,7 +83,7 @@ define host{
use generic-host
host_name <%= host %>
alias <%= host %>
address <%= host %>.<%= @default_host_domain %>
address <%= host %><% unless host.include?(".") %>.<%= @default_host_domain %><% end %>
hostgroups all,aws_host,pageable_servers,smokescreen
}
<% end -%>
@ -93,7 +93,7 @@ define host{
use generic-host
host_name <%= host %>
alias <%= host %>
address <%= host %>.<%= @default_host_domain %>
hostgroups all,aws_host,not_pageable_servers,other
address <%= host %><% unless host.include?(".") %>.<%= @default_host_domain %><% end %>
hostgroups all,<% if host.include?(".") %>non_<% end %>aws_host,not_pageable_servers,other
}
<% end -%>

2
puppet/zulip_ops/templates/supervisor/conf.d/munin_tunnels.conf.erb
View File

@ -5,7 +5,7 @@ i = 0
@hosts.each do |host|
-%>
[program:munin-tunnel-<%= host %>]
command=autossh -N -M <%= 20000 + 2 * i %> -L <%= 5000 + i %>:localhost:4949 nagios@<%= host %>.<%= @default_host_domain %>
command=autossh -N -M <%= 20000 + 2 * i %> -L <%= 5000 + i %>:localhost:4949 nagios@<%= host %><% unless host.include?(".") %>.<%= @default_host_domain %><% end %>
priority=200 ; the relative start priority (default 999)
autostart=true ; start at supervisord start (default: true)
autorestart=true ; whether/when to restart (default: unexpected)