From 3adde3e6260376a79d137ce5cfe74709cb9d68ee Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 4 Aug 2021 08:16:03 +0100 Subject: [PATCH 1/1] Remove role for longma --- roles/longma.rb | 59 ------------------------------------------------- roles/nchc.rb | 29 ------------------------ 2 files changed, 88 deletions(-) delete mode 100644 roles/longma.rb delete mode 100644 roles/nchc.rb diff --git a/roles/longma.rb b/roles/longma.rb deleted file mode 100644 index a3502c6df..000000000 --- a/roles/longma.rb +++ /dev/null @@ -1,59 +0,0 @@ -name "longma" -description "Master role applied to longma" - -default_attributes( - :exim => { - :aliases => { - :root => "ceasar" - } - }, - :hardware => { - :shm_size => "20g" - }, - :networking => { - :interfaces => { - :external_ipv4 => { - :interface => "ens160", - :role => :external, - :family => :inet, - :address => "140.110.240.7", - :prefix => "24", - :gateway => "140.110.240.254" - }, - :external_ipv6 => { - :interface => "ens160", - :role => :external, - :family => :inet6, - :address => "2001:e10:2000:240::7", - :prefix => "64", - :gateway => "2001:e10:2000:240::254" - } - } - }, - :squid => { - :version => 4, - :cache_mem => "16384 MB", - :cache_dir => [ - "rock /store.new-san/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996", - "rock /store.new-san/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", - "rock /store.new-san/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "rock /store.new-san/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" - ] - }, - :nginx => { - :cache => { - :proxy => { - :directory => "/store.new-san/nginx-cache/proxy-cache", - :max_size => "65536M" - } - } - }, - :tilecache => { - :tile_parent => "hsinchu.render.openstreetmap.org" - } -) - -run_list( - "role[nchc]", - "role[tilecache]" -) diff --git a/roles/nchc.rb b/roles/nchc.rb deleted file mode 100644 index 1c434df2a..000000000 --- a/roles/nchc.rb +++ /dev/null @@ -1,29 +0,0 @@ -name "nchc" -description "Role applied to all servers at NCHC" - -default_attributes( - :accounts => { - :users => { - :steven => { :status => :administrator }, - :ceasar => { :status => :administrator } - } - }, - :hosted_by => "NCHC", - :location => "Hsinchu, Taiwan", - :networking => { - :wireguard => { :keepalive => 180 } - } -) - -override_attributes( - :networking => { - :nameservers => ["140.110.16.1", "140.110.4.1"] - }, - :ntp => { - :servers => ["0.tw.pool.ntp.org", "1.tw.pool.ntp.org", "asia.pool.ntp.org"] - } -) - -run_list( - "role[tw]" -) -- 2.43.2