diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/postfix/templates/simple_relay_main.cf | 2 | ||||
| -rw-r--r-- | modules/xymon/templates/bb-hosts | 5 | ||||
| -rw-r--r-- | modules/xymon/templates/hobbit-alerts.cfg | 2 | ||||
| -rw-r--r-- | modules/xymon/templates/hobbit-clients.cfg | 9 |
4 files changed, 2 insertions, 16 deletions
diff --git a/modules/postfix/templates/simple_relay_main.cf b/modules/postfix/templates/simple_relay_main.cf index fa280d58..e0c116a7 100644 --- a/modules/postfix/templates/simple_relay_main.cf +++ b/modules/postfix/templates/simple_relay_main.cf @@ -46,8 +46,6 @@ virtual_alias_maps = regexp:/etc/postfix/sympa_aliases recipient_delimiter = + # This is ugly for a simple relay but we need ml.mageia.org to accept email :( inet_interfaces = all -# Another hack to only have sucuk use it, it seems alamut allows it for relay but not other machines -relayhost = alamut.<%= domain %> <%- else -%> inet_interfaces = localhost <%- end -%> diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts index 9295368c..173b1cb7 100644 --- a/modules/xymon/templates/bb-hosts +++ b/modules/xymon/templates/bb-hosts @@ -33,15 +33,12 @@ page visible Visible Services page servers Servers group-compress Marseille 212.85.158.151 sucuk.<%= domain %> # testip bbd dns smtp ssh CLIENT:xymon.<%= domain %> http://xymon.<%= domain %> -#212.85.158.147 valstar.<%= domain %> # testip ssh 212.85.158.148 ecosse.<%= domain %> # testip ssh -#212.85.158.149 jonund.<%= domain %> # testip ssh 212.85.158.150 fiona.<%= domain %> # testip ssh 212.85.158.152 rabbit.<%= domain %> # testip ssh 212.85.158.153 duvel.<%= domain %> # testip ssh rsync svn git ldapssl ldap -#212.85.158.146 alamut.mageia.org # testip ssh -group-compress VM Alamut +group-compress VM Sucuk 192.168.122.131 friteuse.<%= domain %> # testip ssh http://forums.<%= domain %>=192.168.122.131/ https://forums.<%= domain %>=192.168.122.131/ group-compress Scaleway diff --git a/modules/xymon/templates/hobbit-alerts.cfg b/modules/xymon/templates/hobbit-alerts.cfg index 20ba08c4..10906fe8 100644 --- a/modules/xymon/templates/hobbit-alerts.cfg +++ b/modules/xymon/templates/hobbit-alerts.cfg @@ -118,7 +118,7 @@ # N is the DOWNSECS value. <% -builder = ['jonund','ecosse','rabbit','sucuk'] +builder = ['ecosse','rabbit'] builders = builder.map{|x| x + "." + domain }.join(',') %> HOST=<%= builders %> SERVICE=cpu diff --git a/modules/xymon/templates/hobbit-clients.cfg b/modules/xymon/templates/hobbit-clients.cfg index d0c33034..876cd802 100644 --- a/modules/xymon/templates/hobbit-clients.cfg +++ b/modules/xymon/templates/hobbit-clients.cfg @@ -349,11 +349,6 @@ HOST=rabbit.<%= domain %> DISK %.*stage2$ IGNORE -# jonund has 24 cores and we try and utilise it as much as possible -# la of up to 1.5*cores is probably not problematic -HOST=jonund.<%= domain %> - LOAD 36.0 48.0 - # ecosse has 24 cores, is a builder, and we try to use them all HOST=ecosse.<%= domain %> LOAD 36.0 48.0 @@ -362,10 +357,6 @@ HOST=ecosse.<%= domain %> HOST=rabbit.<%= domain %> LOAD 18.0 24.0 -# sucuk has 12 cores and autobuilder uses all of them -HOST=sucuk.<%= domain %> - LOAD 18.0 24.0 - # duvel has 24 cores, dont trigger alarms too soon HOST=duvel.<%= domain %> LOAD 18.0 24.0 |