From 936fe4672097998ae4acaa6219084a0fe8604f2d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 6 Jan 2015 21:38:57 +0000 Subject: [PATCH] See about making sundries01.stg a mirrorlist1 server for stg. --- playbooks/groups/sundries.yml | 2 ++ roles/haproxy/files/haproxy.cfg.stg | 13 +------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index a11c201877..a66d25b84d 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -47,6 +47,8 @@ when: master_sundries_node and env != "staging" - rsyncd - mirrormanager/frontend + - role: mirrormanager/mirrorlists + when: env == "staging" - freemedia - sudo - pager_server diff --git a/roles/haproxy/files/haproxy.cfg.stg b/roles/haproxy/files/haproxy.cfg.stg index 39b13d3f8e..280aac5fd3 100644 --- a/roles/haproxy/files/haproxy.cfg.stg +++ b/roles/haproxy/files/haproxy.cfg.stg @@ -41,23 +41,12 @@ listen fp-wiki 0.0.0.0:10001 listen mirror-lists 0.0.0.0:10002 balance hdr(appserver) timeout connect 30s - server app1 app1:80 check inter 5s rise 2 fall 3 - server app2 app2:80 check inter 5s rise 2 fall 3 - server app3 app3:80 check inter 5s rise 2 fall 3 - server app4 app4:80 check inter 5s rise 2 fall 3 - server app05 app05:80 backup check inter 10s rise 2 fall 3 -# server bapp1 bapp1:80 backup check inter 5s rise 2 fall 3 + server sundries01 sundries01:80 check inter 10s rise 2 fall 3 option httpchk GET /mirrorlist - option allbackups listen pkgdb 0.0.0.0:10003 balance hdr(appserver) server pkgdb01 pkgdb01:80 check inter 10s rise 2 fall 3 -# server app2 app2:80 check inter 10s rise 2 fall 3 -# server app3 app3:80 check inter 10s rise 2 fall 3 -# server app4 app4:80 check inter 10s rise 2 fall 3 -# server app05 app05:80 backup check inter 15s rise 2 fall 3 -# server bapp1 bapp1:80 backup check inter 10s rise 2 fall 3 option httpchk GET /pkgdb/collections/ listen fas 0.0.0.0:10004