From: Tom Hughes Date: Wed, 21 Jul 2021 19:31:04 +0000 (+0100) Subject: Remove roles for kalessin, nidhogg and sarkany X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/fa9ae92ea71f760b58f80744c4cca4b26d0cee98?ds=sidebyside Remove roles for kalessin, nidhogg and sarkany --- diff --git a/roles/ffrl.rb b/roles/ffrl.rb deleted file mode 100644 index 96109c443..000000000 --- a/roles/ffrl.rb +++ /dev/null @@ -1,17 +0,0 @@ -name "ffrl" -description "Role applied to all servers at Freifunk Rheinland" - -default_attributes( - :hosted_by => "Freifunk Rheinland", - :location => "Berlin, Germany" -) - -override_attributes( - :ntp => { - :servers => ["0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org"] - } -) - -run_list( - "role[de]" -) diff --git a/roles/kalessin.rb b/roles/kalessin.rb deleted file mode 100644 index 1a094e65e..000000000 --- a/roles/kalessin.rb +++ /dev/null @@ -1,54 +0,0 @@ -name "kalessin" -description "Master role applied to kalessin" - -default_attributes( - :hardware => { - :shm_size => "20g" - }, - :networking => { - :interfaces => { - :external_ipv4 => { - :interface => "ens3", - :role => :external, - :family => :inet, - :address => "185.66.195.245", - :prefix => "28", - :gateway => "185.66.195.241" - }, - :external_ipv6 => { - :interface => "ens3", - :role => :external, - :family => :inet6, - :address => "2a03:2260:2000:1::5", - :prefix => "64", - :gateway => "2a03:2260:2000:1::1" - } - } - }, - :squid => { - :version => 4, - :cache_mem => "16384 MB", - :cache_dir => [ - "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996", - "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", - "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" - ] - }, - :nginx => { - :cache => { - :proxy => { - :keys_zone => "proxy_cache_zone:64M", - :max_size => "2048M" - } - } - }, - :tilecache => { - :tile_parent => "germany.render.openstreetmap.org" - } -) - -run_list( - "role[ffrl]", - "role[tilecache]" -) diff --git a/roles/lysator.rb b/roles/lysator.rb deleted file mode 100644 index 09c2aaff7..000000000 --- a/roles/lysator.rb +++ /dev/null @@ -1,26 +0,0 @@ -name "lysator" -description "Role applied to all servers at Lysator" - -default_attributes( - :accounts => { - :users => { - :aoh => { :status => :administrator }, - :lysroot => { :status => :administrator } - } - }, - :hosted_by => "Lysator", - :location => "Linköping, Sweden" -) - -override_attributes( - :networking => { - :nameservers => ["130.236.254.225", "2001:6b0:17:f0a0::e1", "130.236.254.4"] - }, - :ntp => { - :servers => ["0.se.pool.ntp.org", "1.se.pool.ntp.org", "europe.pool.ntp.org"] - } -) - -run_list( - "role[se]" -) diff --git a/roles/nidhogg.rb b/roles/nidhogg.rb deleted file mode 100644 index 451950fdb..000000000 --- a/roles/nidhogg.rb +++ /dev/null @@ -1,46 +0,0 @@ -name "nidhogg" -description "Master role applied to nidhogg" - -default_attributes( - :hardware => { - :shm_size => "14g" - }, - :networking => { - :interfaces => { - :external_ipv4 => { - :interface => "ens18", - :role => :external, - :family => :inet, - :address => "130.236.254.221", - :prefix => "24", - :gateway => "130.236.254.1" - }, - :external_ipv6 => { - :interface => "ens18", - :role => :external, - :family => :inet6, - :address => "2001:6b0:17:f0a0::dd", - :prefix => "64", - :gateway => "2001:6b0:17:f0a0::1" - } - } - }, - :squid => { - :version => 4, - :cache_mem => "10240 MB", - :cache_dir => [ - "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996", - "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", - "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" - ] - }, - :tilecache => { - :tile_parent => "sweden.render.openstreetmap.org" - } -) - -run_list( - "role[lysator]", - "role[tilecache]" -) diff --git a/roles/sarkany.rb b/roles/sarkany.rb deleted file mode 100644 index 6cd1424f7..000000000 --- a/roles/sarkany.rb +++ /dev/null @@ -1,53 +0,0 @@ -name "sarkany" -description "Master role applied to sarkany" - -default_attributes( - :hardware => { - :shm_size => "8g" - }, - :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 => { - :version => 4, - :cache_mem => "6144 MB", - :cache_dir => [ - "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996", - "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", - "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" - ] - }, - :nginx => { - :cache => { - :proxy => { - :max_size => "4096M" - } - } - }, - :tilecache => { - :tile_parent => "budapest.render.openstreetmap.org" - } -) - -run_list( - "role[szerverem]", - "role[tilecache]" -) diff --git a/roles/szerverem.rb b/roles/szerverem.rb deleted file mode 100644 index fc23d22f8..000000000 --- a/roles/szerverem.rb +++ /dev/null @@ -1,17 +0,0 @@ -name "szerverem" -description "Role applied to all servers at szerverem.hu" - -default_attributes( - :hosted_by => "szerverem.hu", - :location => "Budapest, Hungary" -) - -override_attributes( - :ntp => { - :servers => ["0.hu.pool.ntp.org", "1.hu.pool.ntp.org", "europe.pool.ntp.org"] - } -) - -run_list( - "role[hu]" -)