Make mediawiki sites redirect to https

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 098568265d6a8eac79bc65202b6d0f236cf6bf4d..ab306c6a2e5bb7d709dc076ece8b4fa983f176de 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -23,7 +23,7 @@ default_attributes(
     }
   },
   :git => {
     }
   },
   :git => {

-    :allowed_nodes => "*:*",
+    :allowed_nodes => "fqdn:*",

     :user => "chefrepo",
     :group => "chefrepo",
     :backup => "chef-git"
     :user => "chefrepo",
     :group => "chefrepo",
     :backup => "chef-git"


@@ -59,9 +59,27 @@ default_attributes(
         :peer => {
           :host => "ridley.openstreetmap.org"
         }
         :peer => {
           :host => "ridley.openstreetmap.org"
         }

+      },
+      :aws2ic => {
+        :port => "1195",
+        :mode => "server",
+        :peer => {
+          :host => "fafnir.openstreetmap.org"
+        }
+      },
+      :ic2bm => {
+        :port => "1196",
+        :mode => "client",
+        :peer => {
+          :host => "grisu.openstreetmap.org",
+          :port => "1194"
+        }

       }
     }
   },
       }
     }
   },

+  :planet => {
+    :replication => "enabled"
+  },

   :rsyncd => {
     :modules => {
       :hosts => {
   :rsyncd => {
     :modules => {
       :hosts => {


@@ -89,11 +107,13 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [

-          "128.40.168.0/24",      # ucl external (wates)
-          "128.40.45.192/27",     # ucl external (wolfson)
+          "193.60.236.0/24",      # ucl external

           "146.179.159.160/27",   # ic internal
           "193.63.75.96/27",      # ic external
           "2001:630:12:500::/64", # ic external
           "146.179.159.160/27",   # ic internal
           "193.63.75.96/27",      # ic external
           "2001:630:12:500::/64", # ic external

+          "10.0.32.0/20",         # bytemark internal
+          "89.16.162.16/28",      # bytemark external
+          "2001:41c9:2:d6::/64",  # bytemark external

           "127.0.0.0/8",          # localhost
           "::1"                   # localhost
         ],
           "127.0.0.0/8",          # localhost
           "::1"                   # localhost
         ],


@@ -115,8 +135,10 @@ run_list(
   "role[planet]",
   "role[planetdump]",
   "role[logstash]",
   "role[planet]",
   "role[planetdump]",
   "role[logstash]",

+  "role[letsencrypt]",

   "recipe[rsyncd]",
   "recipe[openvpn]",
   "recipe[git::server]",
   "recipe[rsyncd]",
   "recipe[openvpn]",
   "recipe[git::server]",

-  "recipe[tilelog]"
+  "recipe[tilelog]",
+  "recipe[serverinfo]"

 )
 )