cleanups

- added missing config
- cleaned some indention
- module renaming from Test to DsAdmin iin storage/config.rb

config/storage.yml

@@ -0,0 +1,82 @@
+:DsAdmin::Storage::Ldap:
+  :con:
+    :host: 'host.weird-web-workers.org'
+    :port: 389
+
+  :DsAdmin::Model::User:
+    :query:
+      :base:   'ou=user,o=system,dc=weird-web-workers,dc=org'
+      :filter: '(objectClass=posixAccount)'
+
+    :objectClass:
+      - 'account'
+      - 'posixAccount'
+      - 'shadowAccount'
+
+    :map:
+      :uid:           :name
+      :userpassword:  :pass
+      :uidnumber:     :uid
+      :gidnumber:     :gid
+      :loginshell:    :shell
+      :homedirectory: :home
+
+  :DsAdmin::Model::Group:
+    :query:
+      :base:   'ou=group,o=system,dc=weird-web-workers,dc=org'
+      :filter: '(objectClass=posixGroup)'
+
+    :objectClass: 'posixGroup'
+
+    :map:
+      :cn:        :name
+      :gidnumber: :gid
+      :memberuid: :members
+
+  :DsAdmin::Model::Site:
+    :query:
+      :base:   'o=hosting,dc=weird-web-workers,dc=org'
+      :filter: '(&(objectClass=organization)(!(o=hosting)))'
+
+    :objectClass: 'organization'
+
+    :map:
+      :o: :name
+
+  :DsAdmin::Model::MailAliasRole:
+    :query:
+      :base:   'o=hosting,dc=weird-web-workers,dc=org'
+      :filter: '(&(objectClass=MailAlias)(objectClass=organizationalrole))'
+
+    :objectClass:
+      - 'organizationalRole'
+      - 'MailAlias'
+
+    :map:
+      :cn: :user
+
+  :DsAdmin::Model::MailAliasPerson:
+    :query:
+      :base:   'o=hosting,dc=weird-web-workers,dc=org'
+      :filter: '(&(objectClass=MailAlias)(objectClass=person))'
+
+    :objectClass: 
+      - 'person'
+      - 'MailAlias'
+
+    :map:
+      :sn: :surname
+      :cn: :name
+
+  :DsAdmin::Model::MailAccount:
+    :query:
+      :base:   'o=hosting,dc=weird-web-workers,dc=org'
+      :filter: '(objectClass=mailAccount)'
+
+    :objectClass: 
+      - 'person'
+      - 'MailAccount'
+
+    :map:
+      :homedirectory: :home
+

model.rb

@@ -33,7 +33,7 @@ module DsAdmin::Model
   def each(&block)
     all.each(&block)
   end
-  
+
   def load(id)
     self.class.new(_load(id))
   end

model/mail_account.rb

@@ -3,16 +3,16 @@ class DsAdmin::Model::MailAccount
 
   attr_accessor :mail, :mailbox
 
-	def initialize(args = {})
+  def initialize(args = {})
     return if args.empty?
-		super(args)
+    super(args)
 
-		@mail     = args[:mail]
-		@home     = args[:home]
-		@mailbox  = args[:mailbox]
-	end
+    @mail     = args[:mail]
+    @home     = args[:home]
+    @mailbox  = args[:mailbox]
+  end
 
-	def site
-		@mail.sub(/.*@/, '')
-	end
+  def site
+    @mail.sub(/.*@/, '')
+  end
 end

model/mail_alias_person.rb

@@ -3,17 +3,17 @@ class DsAdmin::Model::MailAliasPerson
 
   attr_accessor :mail, :maildrop, :surname, :name
 
-	def initialize(args = {})
+  def initialize(args = {})
     return if args.empty?
     super(args)
 
-		@mail     = args[:mail]
-		@maildrop = args[:maildrop]
-		@surname  = args[:surname]
-		@name     = args[:name]
-	end
+    @mail     = args[:mail]
+    @maildrop = args[:maildrop]
+    @surname  = args[:surname]
+    @name     = args[:name]
+  end
 
-	def site
-		@mail.sub(/.*@/, '')
-	end
+  def site
+    @mail.sub(/.*@/, '')
+  end
 end

model/mail_alias_role.rb

@@ -3,16 +3,16 @@ class DsAdmin::Model::MailAliasRole
 
   attr_accessor :mail, :maildrop, :user
 
-	def initialize(args = {})
+  def initialize(args = {})
     return if args.empty?
     super(args)
 
-		@mail     = args[:mail]
-		@maildrop = args[:maildrop]
-		@user     = args[:user]
-	end
+    @mail     = args[:mail]
+    @maildrop = args[:maildrop]
+    @user     = args[:user]
+  end
 
-	def site
-		@mail.sub(/.*@/, '')
-	end
+  def site
+    @mail.sub(/.*@/, '')
+  end
 end

model/site.rb

@@ -1,12 +1,12 @@
 class DsAdmin::Model::Site
   include DsAdmin::Model
 
-	attr_accessor :name
+  attr_accessor :name
 
-	def initialize(args = {})
+  def initialize(args = {})
     return if args.empty?
-		super(args)
+    super(args)
 
-		@name = args[:name]
-	end
+    @name = args[:name]
+  end
 end

storage/config.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 
-class Test::Storage::Config
+class DsAdmin::Storage::Config
   attr_accessor :model
 
   def initialize(yml_file)