]> git.openstreetmap.org Git - chef.git/commitdiff
projects / chef.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 6288ab7)
Merge remote-tracking branch 'github/pull/259'
authorTom Hughes <tom@compton.nu>
Wed, 18 Mar 2020 18:11:55 +0000 (18:11 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 18 Mar 2020 18:11:55 +0000 (18:11 +0000)
cookbooks/dev/files/default/ooc/index.html patch | blob | history
cookbooks/dns/templates/default/zone.html.erb patch | blob | history
cookbooks/gps-tile/files/default/html/index.html patch | blob | history
roles/ar.rb [new file with mode: 0644] patch | blob
roles/edgeuno-ar.rb [new file with mode: 0644] patch | blob
roles/edgeuno-br.rb [new file with mode: 0644] patch | blob
roles/edgeuno-co.rb [new file with mode: 0644] patch | blob
roles/edgeuno.rb patch | blob | history
roles/fuchur.rb [new file with mode: 0644] patch | blob
roles/gorwen.rb patch | blob | history
roles/idris.rb [new file with mode: 0644] patch | blob

diff --git a/cookbooks/dev/files/default/ooc/index.html b/cookbooks/dev/files/default/ooc/index.html
index e7208b0ae63c447d064c4cd7edb44c30be7b7682..d6aa0621264b0968edfa852acf02098646fe83cf 100644 (file)
--- a/cookbooks/dev/files/default/ooc/index.html
+++ b/cookbooks/dev/files/default/ooc/index.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="map.css" type="text/css" media="all" />
     <link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.0/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin="anonymous" />
     <script src="https://unpkg.com/leaflet@1.3.0/dist/leaflet.js" integrity="sha512-C7BBF9irt5R7hqbUm2uxtODlUVs+IsNu2UULGuZN7gM+k/mmeG4xvIEac01BtQa4YIkUpp23zZC4wIwuXaPMQA==" crossorigin="anonymous"></script>
-    <script type="text/javascript" src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
     <script type="text/javascript" src="map.js"></script>
   </head>
   <body>
diff --git a/cookbooks/dns/templates/default/zone.html.erb b/cookbooks/dns/templates/default/zone.html.erb
index 3bf01af60011dde3fdcdb2a87720eb8552be7a0f..fb34d94bd3bdaee8504647e4d76a90f8ee610b10 100644 (file)
--- a/cookbooks/dns/templates/default/zone.html.erb
+++ b/cookbooks/dns/templates/default/zone.html.erb
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="dns.css" type="text/css" media="all" />
     <link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.0/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin="anonymous" />
     <script src="https://unpkg.com/leaflet@1.3.0/dist/leaflet.js" integrity="sha512-C7BBF9irt5R7hqbUm2uxtODlUVs+IsNu2UULGuZN7gM+k/mmeG4xvIEac01BtQa4YIkUpp23zZC4wIwuXaPMQA==" crossorigin="anonymous"></script>
-    <script type="text/javascript" src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
     <script type="text/javascript" src="dns.js"></script>
   </head>
   <body onload="createMap('map', 'json/<%= @zone %>.json')">
diff --git a/cookbooks/gps-tile/files/default/html/index.html b/cookbooks/gps-tile/files/default/html/index.html
index e5818349d92e3e34ec6ab867354d71cd23f104ba..cb62f1a177276bf4fdd171932c29255976605ff6 100644 (file)
--- a/cookbooks/gps-tile/files/default/html/index.html
+++ b/cookbooks/gps-tile/files/default/html/index.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="map.css" type="text/css" media="all" />
     <link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.0/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin="anonymous" />
     <script src="https://unpkg.com/leaflet@1.3.0/dist/leaflet.js" integrity="sha512-C7BBF9irt5R7hqbUm2uxtODlUVs+IsNu2UULGuZN7gM+k/mmeG4xvIEac01BtQa4YIkUpp23zZC4wIwuXaPMQA==" crossorigin="anonymous"></script>
-    <script src="//code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
     <script type="text/javascript" src="map.js"></script>
   </head>
   <body>
diff --git a/roles/ar.rb b/roles/ar.rb
new file mode 100644 (file)
index 0000000..ec8b086
--- /dev/null
+++ b/roles/ar.rb
@@ -0,0 +1,10 @@
+name "ar"
+description "Role applied to all servers located in Argentina"
+
+override_attributes(
+  :country => "ar"
+)
+
+run_list(
+  "role[base]"
+)
diff --git a/roles/edgeuno-ar.rb b/roles/edgeuno-ar.rb
new file mode 100644 (file)
index 0000000..edf7303
--- /dev/null
+++ b/roles/edgeuno-ar.rb
@@ -0,0 +1,17 @@
+name "edgeuno-ar"
+description "Role applied to all servers at Edgeuno AR"
+
+default_attributes(
+  :location => "Buenos Aires, Argentina"
+)
+
+override_attributes(
+  :ntp => {
+    :servers => ["0.ar.pool.ntp.org", "1.ar.pool.ntp.org", "south-america.pool.ntp.org"]
+  }
+)
+
+run_list(
+  "role[ar]",
+  "role[edgeuno]"
+)
diff --git a/roles/edgeuno-br.rb b/roles/edgeuno-br.rb
new file mode 100644 (file)
index 0000000..5b06c69
--- /dev/null
+++ b/roles/edgeuno-br.rb
@@ -0,0 +1,17 @@
+name "edgeuno-br"
+description "Role applied to all servers at Edgeuno BR"
+
+default_attributes(
+  :location => "São Paulo, Brasil"
+)
+
+override_attributes(
+  :ntp => {
+    :servers => ["0.br.pool.ntp.org", "1.br.pool.ntp.org", "south-america.pool.ntp.org"]
+  }
+)
+
+run_list(
+  "role[br]",
+  "role[edgeuno]"
+)
diff --git a/roles/edgeuno-co.rb b/roles/edgeuno-co.rb
new file mode 100644 (file)
index 0000000..8bb11de
--- /dev/null
+++ b/roles/edgeuno-co.rb
@@ -0,0 +1,17 @@
+name "edgeuno-co"
+description "Role applied to all servers at Edgeuno CO"
+
+default_attributes(
+  :location => "Bogotá, Colombia"
+)
+
+override_attributes(
+  :ntp => {
+    :servers => ["0.co.pool.ntp.org", "1.co.pool.ntp.org", "south-america.pool.ntp.org"]
+  }
+)
+
+run_list(
+  "role[co]",
+  "role[edgeuno]"
+)
diff --git a/roles/edgeuno.rb b/roles/edgeuno.rb
index 2563e76b5309dc8a2e79c0f8e36d04c8dfce133f..a11b1af865fa2bd5d5e156e1435adf097c730d3e 100644 (file)
--- a/roles/edgeuno.rb
+++ b/roles/edgeuno.rb
@@ -8,7 +8,6 @@ default_attributes(
     }
   },
   :hosted_by => "EdgeUno",
-  :location => "Bogotá, Colombia",
   :networking => {
     :firewall => {
       :inet => [
@@ -45,13 +44,3 @@ default_attributes(
     }
   }
 )
-
-override_attributes(
-  :ntp => {
-    :servers => ["0.co.pool.ntp.org", "1.co.pool.ntp.org", "south-america.pool.ntp.org"]
-  }
-)
-
-run_list(
-  "role[co]"
-)
diff --git a/roles/fuchur.rb b/roles/fuchur.rb
new file mode 100644 (file)
index 0000000..226e028
--- /dev/null
+++ b/roles/fuchur.rb
@@ -0,0 +1,53 @@
+name "fuchur"
+description "Master role applied to fuchur"
+
+default_attributes(
+  :hardware => {
+    :shm_size => "20g"
+  },
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "ens160",
+        :role => :external,
+        :family => :inet,
+        :address => "200.25.58.164",
+        :prefix => "27",
+        :gateway => "200.25.58.161"
+      },
+      :external_ipv6 => {
+        :interface => "ens160",
+        :role => :external,
+        :family => :inet6,
+        :address => "2800:1e0:1020::44",
+        :prefix => "123",
+        :gateway => "2800:1e0:1020::41"
+      }
+    }
+  },
+  :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 => {
+        :max_size => "8192M"
+      }
+    }
+  },
+  :tilecache => {
+    :tile_parent => "bogota.render.openstreetmap.org"
+  }
+)
+
+run_list(
+  "role[edgeuno-br]",
+  "role[tilecache]"
+)
diff --git a/roles/gorwen.rb b/roles/gorwen.rb
index 20dc8929c34335d3a1e1c8866d3a3a5a9f5eff2d..773e389cefb8c4f4628a44430a559dc6a3849e26 100644 (file)
--- a/roles/gorwen.rb
+++ b/roles/gorwen.rb
@@ -3,7 +3,7 @@ description "Master role applied to gorwen"
 
 default_attributes(
   :hardware => {
-    :shm_size => "10g"
+    :shm_size => "20g"
   },
   :networking => {
     :interfaces => {
@@ -27,7 +27,7 @@ default_attributes(
   },
   :squid => {
     :version => 4,
-    :cache_mem => "6144 MB",
+    :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",
@@ -48,6 +48,6 @@ default_attributes(
 )
 
 run_list(
-  "role[edgeuno]",
+  "role[edgeuno-co]",
   "role[tilecache]"
 )
diff --git a/roles/idris.rb b/roles/idris.rb
new file mode 100644 (file)
index 0000000..374d129
--- /dev/null
+++ b/roles/idris.rb
@@ -0,0 +1,53 @@
+name "idris"
+description "Master role applied to idris"
+
+default_attributes(
+  :hardware => {
+    :shm_size => "10g"
+  },
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "ens160",
+        :role => :external,
+        :family => :inet,
+        :address => "200.25.60.195",
+        :prefix => "27",
+        :gateway => "200.25.60.193"
+      },
+      :external_ipv6 => {
+        :interface => "ens160",
+        :role => :external,
+        :family => :inet6,
+        :address => "2800:1e0:1030::64",
+        :prefix => "123",
+        :gateway => "2800:1e0:1030::61"
+      }
+    }
+  },
+  :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 => {
+        :max_size => "8192M"
+      }
+    }
+  },
+  :tilecache => {
+    :tile_parent => "bogota.render.openstreetmap.org"
+  }
+)
+
+run_list(
+  "role[edgeuno-ar]",
+  "role[tilecache]"
+)
Chef configuration management public repo for configuring & maintaining the OpenStreetMap servers.