Commit cdb8746ee124c135eaaf498cd94a1ccb2492ac49

Authored by Georg GH. Hopp
Committed by Georg Hopp
1 parent 666ae5b6

cleanups

- added missing config
- cleaned some indention
- module renaming from Test to DsAdmin iin storage/config.rb
  1 +:DsAdmin::Storage::Ldap:
  2 + :con:
  3 + :host: 'host.weird-web-workers.org'
  4 + :port: 389
  5 +
  6 + :DsAdmin::Model::User:
  7 + :query:
  8 + :base: 'ou=user,o=system,dc=weird-web-workers,dc=org'
  9 + :filter: '(objectClass=posixAccount)'
  10 +
  11 + :objectClass:
  12 + - 'account'
  13 + - 'posixAccount'
  14 + - 'shadowAccount'
  15 +
  16 + :map:
  17 + :uid: :name
  18 + :userpassword: :pass
  19 + :uidnumber: :uid
  20 + :gidnumber: :gid
  21 + :loginshell: :shell
  22 + :homedirectory: :home
  23 +
  24 + :DsAdmin::Model::Group:
  25 + :query:
  26 + :base: 'ou=group,o=system,dc=weird-web-workers,dc=org'
  27 + :filter: '(objectClass=posixGroup)'
  28 +
  29 + :objectClass: 'posixGroup'
  30 +
  31 + :map:
  32 + :cn: :name
  33 + :gidnumber: :gid
  34 + :memberuid: :members
  35 +
  36 + :DsAdmin::Model::Site:
  37 + :query:
  38 + :base: 'o=hosting,dc=weird-web-workers,dc=org'
  39 + :filter: '(&(objectClass=organization)(!(o=hosting)))'
  40 +
  41 + :objectClass: 'organization'
  42 +
  43 + :map:
  44 + :o: :name
  45 +
  46 + :DsAdmin::Model::MailAliasRole:
  47 + :query:
  48 + :base: 'o=hosting,dc=weird-web-workers,dc=org'
  49 + :filter: '(&(objectClass=MailAlias)(objectClass=organizationalrole))'
  50 +
  51 + :objectClass:
  52 + - 'organizationalRole'
  53 + - 'MailAlias'
  54 +
  55 + :map:
  56 + :cn: :user
  57 +
  58 + :DsAdmin::Model::MailAliasPerson:
  59 + :query:
  60 + :base: 'o=hosting,dc=weird-web-workers,dc=org'
  61 + :filter: '(&(objectClass=MailAlias)(objectClass=person))'
  62 +
  63 + :objectClass:
  64 + - 'person'
  65 + - 'MailAlias'
  66 +
  67 + :map:
  68 + :sn: :surname
  69 + :cn: :name
  70 +
  71 + :DsAdmin::Model::MailAccount:
  72 + :query:
  73 + :base: 'o=hosting,dc=weird-web-workers,dc=org'
  74 + :filter: '(objectClass=mailAccount)'
  75 +
  76 + :objectClass:
  77 + - 'person'
  78 + - 'MailAccount'
  79 +
  80 + :map:
  81 + :homedirectory: :home
  82 +
... ...
... ... @@ -33,7 +33,7 @@ module DsAdmin::Model
33 33 def each(&block)
34 34 all.each(&block)
35 35 end
36   -
  36 +
37 37 def load(id)
38 38 self.class.new(_load(id))
39 39 end
... ...
... ... @@ -3,16 +3,16 @@ class DsAdmin::Model::MailAccount
3 3
4 4 attr_accessor :mail, :mailbox
5 5
6   - def initialize(args = {})
  6 + def initialize(args = {})
7 7 return if args.empty?
8   - super(args)
  8 + super(args)
9 9
10   - @mail = args[:mail]
11   - @home = args[:home]
12   - @mailbox = args[:mailbox]
13   - end
  10 + @mail = args[:mail]
  11 + @home = args[:home]
  12 + @mailbox = args[:mailbox]
  13 + end
14 14
15   - def site
16   - @mail.sub(/.*@/, '')
17   - end
  15 + def site
  16 + @mail.sub(/.*@/, '')
  17 + end
18 18 end
... ...
... ... @@ -3,17 +3,17 @@ class DsAdmin::Model::MailAliasPerson
3 3
4 4 attr_accessor :mail, :maildrop, :surname, :name
5 5
6   - def initialize(args = {})
  6 + def initialize(args = {})
7 7 return if args.empty?
8 8 super(args)
9 9
10   - @mail = args[:mail]
11   - @maildrop = args[:maildrop]
12   - @surname = args[:surname]
13   - @name = args[:name]
14   - end
  10 + @mail = args[:mail]
  11 + @maildrop = args[:maildrop]
  12 + @surname = args[:surname]
  13 + @name = args[:name]
  14 + end
15 15
16   - def site
17   - @mail.sub(/.*@/, '')
18   - end
  16 + def site
  17 + @mail.sub(/.*@/, '')
  18 + end
19 19 end
... ...
... ... @@ -3,16 +3,16 @@ class DsAdmin::Model::MailAliasRole
3 3
4 4 attr_accessor :mail, :maildrop, :user
5 5
6   - def initialize(args = {})
  6 + def initialize(args = {})
7 7 return if args.empty?
8 8 super(args)
9 9
10   - @mail = args[:mail]
11   - @maildrop = args[:maildrop]
12   - @user = args[:user]
13   - end
  10 + @mail = args[:mail]
  11 + @maildrop = args[:maildrop]
  12 + @user = args[:user]
  13 + end
14 14
15   - def site
16   - @mail.sub(/.*@/, '')
17   - end
  15 + def site
  16 + @mail.sub(/.*@/, '')
  17 + end
18 18 end
... ...
1 1 class DsAdmin::Model::Site
2 2 include DsAdmin::Model
3 3
4   - attr_accessor :name
  4 + attr_accessor :name
5 5
6   - def initialize(args = {})
  6 + def initialize(args = {})
7 7 return if args.empty?
8   - super(args)
  8 + super(args)
9 9
10   - @name = args[:name]
11   - end
  10 + @name = args[:name]
  11 + end
12 12 end
... ...
1 1 require 'yaml'
2 2
3   -class Test::Storage::Config
  3 +class DsAdmin::Storage::Config
4 4 attr_accessor :model
5 5
6 6 def initialize(yml_file)
... ...
Please register or login to post a comment