From: Tom Hughes Date: Fri, 6 Mar 2015 09:56:31 +0000 (+0000) Subject: Add role for sarkany X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/1ad93f26f5dcaddb3c1d631e70ee431163017455 Add role for sarkany --- diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb index 879b394c7..761195327 100644 --- a/cookbooks/networking/templates/default/shorewall-zones.erb +++ b/cookbooks/networking/templates/default/shorewall-zones.erb @@ -25,3 +25,4 @@ ool:osm <%= @type %> cnt:osm <%= @type %> jn:osm <%= @type %> es:osm <%= @type %> +sz:osm <%= @type %> diff --git a/roles/hu.rb b/roles/hu.rb new file mode 100644 index 000000000..073abad90 --- /dev/null +++ b/roles/hu.rb @@ -0,0 +1,10 @@ +name "hu" +description "Role applied to all servers located in Hungary" + +override_attributes( + :country => "hu" +) + +run_list( + "role[base]" +) diff --git a/roles/sarkany.rb b/roles/sarkany.rb new file mode 100644 index 000000000..75fe63b3b --- /dev/null +++ b/roles/sarkany.rb @@ -0,0 +1,45 @@ +name "sarkany" +description "Master role applied to sarkany" + +default_attributes( + :networking => { + :interfaces => { + :external_ipv4 => { + :interface => "eth0", + :role => :external, + :family => :inet, + :address => "37.17.173.8", + :prefix => "24", + :gateway => "37.17.173.254" + }, + :external_ipv6 => { + :interface => "eth0", + :role => :external, + :family => :inet6, + :address => "2001:4c48:2:bf04:250:56ff:fe8f:5c81", + :prefix => "64", + :gateway => "fe80::224:14ff:fe84:5000" + } + } + }, + :squid => { + :cache_mem => "6100 MB", + :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80" + }, + :tilecache => { + :tile_parent => "london.render.openstreetmap.org", + :tile_siblings => [ + "trogdor.openstreetmap.org", + "katie.openstreetmap.org", + "konqi.openstreetmap.org", + "ridgeback.openstreetmap.org", + "fume.openstreetmap.org", + "gorynych.openstreetmap.org" + ] + } +) + +run_list( + "role[szerverem]", + "role[tilecache]" +) diff --git a/roles/szerverem.rb b/roles/szerverem.rb new file mode 100644 index 000000000..95250f97b --- /dev/null +++ b/roles/szerverem.rb @@ -0,0 +1,26 @@ +name "szerverem" +description "Role applied to all servers at szerverem.hu" + +default_attributes( + :networking => { + :nameservers => [ + "84.2.44.1", + "84.2.46.1" + ], + :roles => { + :external => { + :zone => "sz" + } + } + } +) + +override_attributes( + :ntp => { + :servers => ["0.hu.pool.ntp.org", "1.hu.pool.ntp.org", "europe.pool.ntp.org"] + } +) + +run_list( + "role[hu]" +)