3 files changed, 4 insertions, 39 deletions
diff --git a/lib/mauve/configuration_builders/notification_method.rb b/lib/mauve/configuration_builders/notification_method.rb
index 3f9283e..7951dee 100644
--- a/lib/mauve/configuration_builders/notification_method.rb
+++ b/lib/mauve/configuration_builders/notification_method.rb
@@ -40,18 +40,6 @@ module Mauve
         result.extend(Mauve::Notifiers::Debug)
       end
      
-      # This catches all methods available for a provider, as needed.
-      #
-      # Missing methods / bad arguments etc. are caught in the
-      # ObjectBuilder#parse method, via NoMethodError.
-      #
-      def method_missing(name, value=nil)
-        if value
-          result.send("#{name}=".to_sym, value)
-        else
-          result.send(name.to_sym)
-        end
-      end
     end
   end
 
diff --git a/lib/mauve/configuration_builders/person.rb b/lib/mauve/configuration_builders/person.rb
index dff6f85..7a20491 100644
--- a/lib/mauve/configuration_builders/person.rb
+++ b/lib/mauve/configuration_builders/person.rb
@@ -18,12 +18,14 @@ module Mauve
       is_block_attribute "urgent"
       is_block_attribute "normal"
       is_block_attribute "low"
+
       is_attribute "password"
       is_attribute "sms"
-      is_attribute "holiday_url"
       is_attribute "email"
       is_attribute "xmpp"
-      is_attribute "sms"
+
+      is_flag_attribute "notify_when_on_holiday!"
+      is_flag_attribute "notify_when_off_sick!"
      
       # Sets the block for all levels of alert
       #
diff --git a/lib/mauve/configuration_builders/server.rb b/lib/mauve/configuration_builders/server.rb
index d22ed87..734fb3b 100644
--- a/lib/mauve/configuration_builders/server.rb
+++ b/lib/mauve/configuration_builders/server.rb
@@ -171,31 +171,6 @@ module Mauve
       is_attribute "use_packet_buffer"
       is_attribute "use_notification_buffer"
   
-      #
-      # This is where the calendar is located.  The request paths are hard-coded.
-      #
-      is_attribute "bytemark_calendar_url" 
-
-      #
-      # This is where the Bytemark authentication server is located.
-      #
-      is_attribute "bytemark_auth_url"
-
-      #
-      # This is the level of SSL verification used when making external HTTPS connections.
-      #
-      is_attribute "remote_https_verify_mode"
-      
-      #
-      # This is the default timeout when making remote HTTP requests
-      #
-      is_attribute "remote_http_timeout"
-
-      #
-      # This is the default sleep time after an authentication attempt has failed. 
-      #
-      is_attribute "failed_login_delay"
-
       def builder_setup
         @result = Mauve::Server.instance
       end