Apply the chef-server and chef-repository roles to ironbelly

[chef.git] / roles / horntail.rb

diff --git a/roles/horntail.rb b/roles/horntail.rb
index 0512ddb5eea35383ff5a086f70d5a28258ce8b6a..4b64c8155235c9aff5bf127501449d9634fb7ece 100644 (file)
--- a/roles/horntail.rb
+++ b/roles/horntail.rb
@@ -4,7 +4,6 @@ description "Master role applied to horntail"
 default_attributes(
   :accounts => {
     :users => {
-      :osmbackup => { :status => :role },
       :gravitystorm => { :status => :user }
     }
   },
@@ -66,18 +65,6 @@ default_attributes(
       }
     }
   },
-  :openvpn => {
-    :address => "10.0.16.2",
-    :tunnels => {
-      :ic2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      }
-    }
-  },
   :rsyncd => {
     :modules => {
       :hosts => {
@@ -112,24 +99,6 @@ default_attributes(
           "127.0.0.0/8",          # localhost
           "::1"                   # localhost
         ]
-      },
-      :backup => {
-        :comment => "Backups",
-        :path => "/store/backup",
-        :read_only => false,
-        :write_only => true,
-        :list => false,
-        :uid => "osmbackup",
-        :gid => "osmbackup",
-        :transfer_logging => false,
-        :hosts_allow => [
-          "128.40.168.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
-          "127.0.0.0/8",          # localhost
-          "::1"                   # localhost
-        ]
       }
     }
   }
@@ -137,12 +106,12 @@ default_attributes(
 
 run_list(
   "role[ic]",
-  "role[gateway]",
   "role[chef-server]",
   "role[chef-repository]",
   "role[planet]",
   "role[stats]",
   "role[web-storage]",
-  "recipe[rsyncd]",
-  "recipe[openvpn]"
+  "role[backup]",
+  "role[supybot]",
+  "recipe[rsyncd]"
 )