Merge pull request #277 from Firefishy/fully-resolve-planet-links-for-mirrors

[chef.git] / roles / bowser.rb

diff --git a/roles/bowser.rb b/roles/bowser.rb
index 1ae0353930c4ceb789c0ef2ab733bc7d864a753b..7334805ff997523e417590519b9752f0e5d17c6b 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -2,10 +2,6 @@ name "bowser"
 description "Master role applied to bowser"
 
 default_attributes(
 description "Master role applied to bowser"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :location => "Carlton, Victoria, Australia",

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -19,11 +15,7 @@ default_attributes(
           :slaves => %w[ens14f0 ens14f1]
         }
       }
           :slaves => %w[ens14f0 ens14f1]
         }
       }

-    },
-    :nameservers => [
-      "202.158.207.1",
-      "202.158.207.2"
-    ]
+    }

   },
   :postgresql => {
     :versions => ["10"],
   },
   :postgresql => {
     :versions => ["10"],


@@ -49,7 +41,6 @@ default_attributes(
       :cluster => "10/main",
       :postgis => "2.4"
     },
       :cluster => "10/main",
       :postgis => "2.4"
     },

-    :node_file => "/store/database/nodes",

     :styles => {
       :default => {
         :tile_directories => [
     :styles => {
       :default => {
         :tile_directories => [