Merge remote-tracking branch 'github/pull/358' into master

[chef.git] / roles / nchc.rb

diff --git a/roles/nchc.rb b/roles/nchc.rb
index 1e4cd5f0a4a2bcf88607c473c6e4c73234027683..1c434df2aac0f53d447b07be04fc96148a795bbc 100644 (file)
--- a/roles/nchc.rb
+++ b/roles/nchc.rb
@@ -8,19 +8,19 @@ default_attributes(
       :ceasar => { :status => :administrator }
     }
   },
+  :hosted_by => "NCHC",
+  :location => "Hsinchu, Taiwan",
   :networking => {
-    :nameservers => ["8.8.8.8", "8.8.4.4"],
-    :roles => {
-      :external => {
-        :zone => "nc"
-      }
-    }
+    :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", "europe.pool.ntp.org"]
+    :servers => ["0.tw.pool.ntp.org", "1.tw.pool.ntp.org", "asia.pool.ntp.org"]
   }
 )