mirror/userdir-ldap.git
10 years agorenamed script
Peter Palfrader [Fri, 10 Jan 2014 17:42:42 +0000 (18:42 +0100)]
renamed script

10 years agonew dns fu
Peter Palfrader [Thu, 9 Jan 2014 09:55:38 +0000 (10:55 +0100)]
new dns fu

10 years agoclean up files another way
Martin Zobel-Helas [Sun, 29 Dec 2013 19:25:06 +0000 (20:25 +0100)]
clean up files another way

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
10 years agotry this
Martin Zobel-Helas [Sun, 29 Dec 2013 18:56:16 +0000 (19:56 +0100)]
try this

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
10 years agoFdb instead of F
Martin Zobel-Helas [Sun, 29 Dec 2013 18:43:13 +0000 (19:43 +0100)]
Fdb instead of F

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
10 years agofix some errors
Martin Zobel-Helas [Sun, 29 Dec 2013 18:41:11 +0000 (19:41 +0100)]
fix some errors

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
10 years agoalso produce dbm files additionaly to cdb
Martin Zobel-Helas [Sun, 29 Dec 2013 17:21:01 +0000 (18:21 +0100)]
also produce dbm files additionaly to cdb

We need to migrate from CDB to DBM, as there is no python-cdb in Debian
stable any more. Provide both file formats, so we can migrate from CDB
to DBM painlessly.

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
10 years agoWe've been removing this symlink for a decade
Stephen Gran [Wed, 20 Nov 2013 19:22:33 +0000 (19:22 +0000)]
We've been removing this symlink for a decade

I think we're safe now.

Signed-off-by: Stephen Gran <steve@lobefin.net>
10 years agoChangelog
Tollef Fog Heen [Wed, 28 Aug 2013 16:02:00 +0000 (18:02 +0200)]
Changelog

10 years agoExport host keys for gitolite too
Tollef Fog Heen [Wed, 28 Aug 2013 16:00:32 +0000 (18:00 +0200)]
Export host keys for gitolite too

10 years agoand a changelog entry
Peter Palfrader [Fri, 2 Aug 2013 21:34:24 +0000 (23:34 +0200)]
and a changelog entry

10 years agoFix unix mtime triggers for ud-generate
Peter Palfrader [Fri, 2 Aug 2013 21:31:45 +0000 (23:31 +0200)]
Fix unix mtime triggers for ud-generate

Previously we only checked if a file had been modified since our last
run.  That didn't catch changes that were only made visible for the next
run.  I.e. a file was changed on some host, ud-generate runs finds no
need to re-generate and stores timestamp X to its statefile.  We rsync
that file to us and on the next ud-geneate run it finds no files
modified since X.

10 years agoAnd also for guests
Peter Palfrader [Thu, 18 Jul 2013 20:12:01 +0000 (22:12 +0200)]
And also for guests

10 years agoWe use schroot now
Peter Palfrader [Thu, 18 Jul 2013 20:10:33 +0000 (22:10 +0200)]
We use schroot now

10 years agoFix a typo
Peter Palfrader [Thu, 18 Jul 2013 20:10:28 +0000 (22:10 +0200)]
Fix a typo

10 years agoFix ipv6 check
Peter Palfrader [Thu, 20 Jun 2013 11:57:16 +0000 (13:57 +0200)]
Fix ipv6 check

10 years agouse valid MX syntax
Peter Palfrader [Fri, 7 Jun 2013 17:07:58 +0000 (19:07 +0200)]
use valid MX syntax

10 years agoAllow incoming-mx remapping in ud-generate
Peter Palfrader [Fri, 7 Jun 2013 17:02:14 +0000 (19:02 +0200)]
Allow incoming-mx remapping in ud-generate

10 years agoud-generate: Support writing gitolite config for just one user-group
Peter Palfrader [Sat, 1 Jun 2013 09:49:14 +0000 (11:49 +0200)]
ud-generate: Support writing gitolite config for just one user-group

10 years agoFix typo in help output
Peter Palfrader [Sat, 1 Jun 2013 09:40:30 +0000 (11:40 +0200)]
Fix typo in help output

10 years agoMinor variable rename
Peter Palfrader [Sat, 1 Jun 2013 09:40:24 +0000 (11:40 +0200)]
Minor variable rename

10 years agoMinor refactoring of IsInGroup so it can take arrays and dicts
Peter Palfrader [Sat, 1 Jun 2013 09:40:11 +0000 (11:40 +0200)]
Minor refactoring of IsInGroup so it can take arrays and dicts

11 years agoud-generate: Allow more than one email address in userForward. Quite useful for...
Peter Palfrader [Mon, 8 Apr 2013 12:02:10 +0000 (14:02 +0200)]
ud-generate: Allow more than one email address in userForward.  Quite useful for role accounts

11 years agodisable dnsZoneEntry and privateSub for guest accounts
Martin Zobel-Helas [Fri, 8 Mar 2013 23:30:07 +0000 (00:30 +0100)]
disable dnsZoneEntry and privateSub for guest accounts
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
11 years agofix generation of voip-passwords file
Martin Zobel-Helas [Tue, 19 Feb 2013 19:58:59 +0000 (20:58 +0100)]
fix generation of voip-passwords file
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
11 years agofix permissions
Martin Zobel-Helas [Sat, 18 Aug 2012 16:24:57 +0000 (18:24 +0200)]
fix permissions
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
11 years agoallow listmasters to write to the privateSub attribute
Martin Zobel-Helas [Sat, 18 Aug 2012 16:15:29 +0000 (18:15 +0200)]
allow listmasters to write to the privateSub attribute
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
11 years agos/looses/loses/
Tollef Fog Heen [Sat, 28 Jul 2012 08:03:49 +0000 (10:03 +0200)]
s/looses/loses/

11 years agoMerge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap
Martin Zobel-Helas [Wed, 13 Jun 2012 22:10:50 +0000 (00:10 +0200)]
Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap

* 'master' of git+ssh://db.debian.org/git/userdir-ldap:
  fix
  userdir-ldap-slapd.conf.in: explicitly list readable attributes.  End with 'by * none'.
  ud-generate: Also rebuild if one of our keyrings has changed, even if ldap has not.
  ud-lock: support supplying a status to set instead of 'retiring'

11 years agoadd voipPassword
Martin Zobel-Helas [Wed, 13 Jun 2012 22:10:32 +0000 (00:10 +0200)]
add voipPassword
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
11 years agofix
Peter Palfrader [Mon, 14 May 2012 16:50:46 +0000 (18:50 +0200)]
fix

11 years agouserdir-ldap-slapd.conf.in: explicitly list readable attributes. End with 'by *...
Peter Palfrader [Mon, 14 May 2012 16:45:39 +0000 (18:45 +0200)]
userdir-ldap-slapd.conf.in: explicitly list readable attributes.  End with 'by * none'.

12 years agoud-generate: Also rebuild if one of our keyrings has changed, even if ldap has not.
Peter Palfrader [Wed, 11 Apr 2012 08:55:50 +0000 (10:55 +0200)]
ud-generate: Also rebuild if one of our keyrings has changed, even if ldap has not.

12 years agoud-lock: support supplying a status to set instead of 'retiring'
Peter Palfrader [Thu, 29 Mar 2012 21:45:28 +0000 (23:45 +0200)]
ud-lock: support supplying a status to set instead of 'retiring'

12 years agoMerge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap
Martin Zobel-Helas [Fri, 23 Mar 2012 18:19:56 +0000 (19:19 +0100)]
Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap

* 'master' of git+ssh://db.debian.org/git/userdir-ldap:
  change mailPreserveSuffixSeparator to a string Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

12 years agochange mailPreserveSuffixSeparator to a string
Martin Zobel-Helas [Fri, 23 Mar 2012 18:16:06 +0000 (19:16 +0100)]
change mailPreserveSuffixSeparator to a string
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
12 years agochange mailPreserveSuffixSeparator to a string
Martin Zobel-Helas [Fri, 23 Mar 2012 18:16:06 +0000 (19:16 +0100)]
change mailPreserveSuffixSeparator to a string
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
12 years agoMerge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap
Martin Zobel-Helas [Fri, 23 Mar 2012 12:59:51 +0000 (13:59 +0100)]
Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap

* 'master' of git+ssh://db.debian.org/git/userdir-ldap: (21 commits)
  ud-generate: lock replicators
  Set generate_dir in the non-override case
  Get lock sooner, connect to ldap later
  flocks do not need freeing
  Profile if UD_PROFILE is in environment
  No need to depend on python-lockfile anymore
  Use flock()
  Use eatmydata!
  UDLdap.py: make a cache for __getitem__() decisions.
  No need to mkdir userkeys directory anymore
  get rid of global state variable CurrentHost.  This will enable upcoming changes.
  GenerateDir is no longer a global var
  minor nit
  speed up ssh tarball generation
  ud-generate speed, I
  ud-generate: Move main code into a ud_generate()
  ud-generate: Add -f option to build even if cache is current
  ud-generate: Move code into getLastBuildTime() and getLastLDAPChangeTime() functions.
  ud-generate: No longer expand $ in dnsZoneEntry data to a \n\t.
  changelog entry for ud-mailgate fix
  ...

12 years agoadd mailPreserveSuffixSeparator to LDAP schema
Martin Zobel-Helas [Fri, 23 Mar 2012 12:59:13 +0000 (13:59 +0100)]
add mailPreserveSuffixSeparator to LDAP schema
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
12 years agoud-generate: lock replicators
Peter Palfrader [Mon, 12 Mar 2012 15:57:54 +0000 (16:57 +0100)]
ud-generate: lock replicators

ud-generate: The ssh authorized_keys file for the sshdist user now wraps
the rsync call in an flock wrapper that acquires a shared lock on
ud-generate's lock.  This prevents syncing while ud-generate runs.

12 years agoSet generate_dir in the non-override case
Peter Palfrader [Mon, 12 Mar 2012 15:46:20 +0000 (16:46 +0100)]
Set generate_dir in the non-override case

12 years agoGet lock sooner, connect to ldap later
Peter Palfrader [Mon, 12 Mar 2012 15:29:50 +0000 (16:29 +0100)]
Get lock sooner, connect to ldap later

12 years agoflocks do not need freeing
Peter Palfrader [Mon, 12 Mar 2012 15:29:16 +0000 (16:29 +0100)]
flocks do not need freeing

12 years agoProfile if UD_PROFILE is in environment
Peter Palfrader [Mon, 12 Mar 2012 15:28:29 +0000 (16:28 +0100)]
Profile if UD_PROFILE is in environment

12 years agoNo need to depend on python-lockfile anymore
Peter Palfrader [Mon, 12 Mar 2012 15:17:53 +0000 (16:17 +0100)]
No need to depend on python-lockfile anymore

12 years agoUse flock()
Peter Palfrader [Mon, 12 Mar 2012 15:16:28 +0000 (16:16 +0100)]
Use flock()

12 years agoUse eatmydata!
Peter Palfrader [Mon, 12 Mar 2012 14:52:04 +0000 (15:52 +0100)]
Use eatmydata!

12 years agoUDLdap.py: make a cache for __getitem__() decisions.
Peter Palfrader [Mon, 12 Mar 2012 14:47:43 +0000 (15:47 +0100)]
UDLdap.py: make a cache for __getitem__() decisions.

12 years agoNo need to mkdir userkeys directory anymore
Peter Palfrader [Mon, 12 Mar 2012 14:17:20 +0000 (15:17 +0100)]
No need to mkdir userkeys directory anymore

12 years agoget rid of global state variable CurrentHost. This will enable upcoming changes.
Peter Palfrader [Mon, 12 Mar 2012 14:16:16 +0000 (15:16 +0100)]
get rid of global state variable CurrentHost.  This will enable upcoming changes.

12 years agoGenerateDir is no longer a global var
Peter Palfrader [Mon, 12 Mar 2012 13:57:53 +0000 (14:57 +0100)]
GenerateDir is no longer a global var

12 years agominor nit
Peter Palfrader [Mon, 12 Mar 2012 13:00:41 +0000 (14:00 +0100)]
minor nit

12 years agospeed up ssh tarball generation
Peter Palfrader [Mon, 12 Mar 2012 12:56:10 +0000 (13:56 +0100)]
speed up ssh tarball generation

No longer write indidividual user's ssh authorized_keys to disk, only to
read them later.  Directly create a TarInfo object without referring to
any on-disk files.

12 years agoud-generate speed, I
Peter Palfrader [Mon, 12 Mar 2012 11:53:56 +0000 (12:53 +0100)]
ud-generate speed, I

cut down on calls to IsInGroup by doing it once in generate_host() and
not having the individual generators run it.

side effect: Up until now we exported empty groups to a host, if that group had
a user with that group as their primary group - even if that particular user
was not exported to this this.  No we no longer export empty groups.

12 years agoud-generate: Move main code into a ud_generate()
Peter Palfrader [Mon, 12 Mar 2012 11:06:49 +0000 (12:06 +0100)]
ud-generate: Move main code into a ud_generate()

12 years agoud-generate: Add -f option to build even if cache is current
Peter Palfrader [Mon, 12 Mar 2012 10:56:18 +0000 (11:56 +0100)]
ud-generate: Add -f option to build even if cache is current

12 years agoud-generate: Move code into getLastBuildTime() and getLastLDAPChangeTime() functions.
Peter Palfrader [Mon, 12 Mar 2012 10:46:12 +0000 (11:46 +0100)]
ud-generate: Move code into getLastBuildTime() and getLastLDAPChangeTime() functions.

12 years agoud-generate: No longer expand $ in dnsZoneEntry data to a \n\t.
Peter Palfrader [Mon, 12 Mar 2012 10:37:48 +0000 (11:37 +0100)]
ud-generate: No longer expand $ in dnsZoneEntry data to a \n\t.

12 years agochangelog entry for ud-mailgate fix
Peter Palfrader [Sat, 10 Mar 2012 18:05:08 +0000 (19:05 +0100)]
changelog entry for ud-mailgate fix

12 years agoDo not try to do an ldap modify with no changes - now show command to changes@ should...
Peter Palfrader [Sat, 10 Mar 2012 18:04:15 +0000 (19:04 +0100)]
Do not try to do an ldap modify with no changes - now show command to changes@ should work again

12 years agofix dependency, needed by ud-generate
Martin Zobel-Helas [Sat, 10 Mar 2012 16:44:43 +0000 (17:44 +0100)]
fix dependency, needed by ud-generate

12 years agoMake cache_last_mod thing more robust
Peter Palfrader [Sat, 10 Mar 2012 14:44:59 +0000 (15:44 +0100)]
Make cache_last_mod thing more robust

12 years agomake ud-generate work when there is no previous run that created last_update.trace
Peter Palfrader [Sat, 10 Mar 2012 14:33:13 +0000 (15:33 +0100)]
make ud-generate work when there is no previous run that created last_update.trace

12 years agodebianGroups may have cn attribute
Peter Palfrader [Sat, 10 Mar 2012 14:21:29 +0000 (15:21 +0100)]
debianGroups may have cn attribute

12 years agoMerge from torproject.org:
Peter Palfrader [Sat, 10 Mar 2012 13:50:22 +0000 (14:50 +0100)]
Merge from torproject.org:

- Allow sshRSAAuthKey for role accounts.
- Support ssh key attributes for gitolite export.
- Add ssh-gitolite support.

12 years agoOne less hardcode debian.org domain in slapd.conf snippet
Peter Palfrader [Sat, 10 Mar 2012 13:44:43 +0000 (14:44 +0100)]
One less hardcode debian.org domain in slapd.conf snippet

12 years agochangelog entry
Stephen Gran [Sat, 10 Mar 2012 08:06:35 +0000 (08:06 +0000)]
changelog entry

Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agopurge old logs
Stephen Gran [Sat, 10 Mar 2012 08:05:18 +0000 (08:05 +0000)]
purge old logs

Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoand ship new file to hosts
Stephen Gran [Fri, 9 Mar 2012 20:19:55 +0000 (20:19 +0000)]
and ship new file to hosts

Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoWrite both time of last ldap update and time of last run to trace file
Stephen Gran [Fri, 9 Mar 2012 20:17:26 +0000 (20:17 +0000)]
Write both time of last ldap update and time of last run to trace file

Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agorecord both time of last action and last run
Stephen Gran [Fri, 9 Mar 2012 20:13:46 +0000 (20:13 +0000)]
record both time of last action and last run
Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoud-replicate: set correct permissions for web-passwords
Martin Zobel-Helas [Fri, 9 Mar 2012 09:33:57 +0000 (10:33 +0100)]
ud-replicate: set correct permissions for web-passwords
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
12 years agoexport webPassword
Martin Zobel-Helas [Thu, 8 Mar 2012 22:31:36 +0000 (23:31 +0100)]
export webPassword
Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
12 years agomess with uid number generation
Peter Palfrader [Mon, 5 Mar 2012 10:56:00 +0000 (11:56 +0100)]
mess with uid number generation

* Allow a set of users to be ignored for picking UIDs.
* When picking uid/gid numbers try to pick the same number for both.

12 years agoIntroduce BaseBaseDN which is the real base dn
Peter Palfrader [Mon, 5 Mar 2012 10:28:03 +0000 (11:28 +0100)]
Introduce BaseBaseDN which is the real base dn

12 years agouserdir_ldap.py: read auth password from environment if set
Peter Palfrader [Mon, 5 Mar 2012 10:17:58 +0000 (11:17 +0100)]
userdir_ldap.py: read auth password from environment if set

12 years agoSync welcome-message-800
Peter Palfrader [Wed, 29 Feb 2012 16:24:35 +0000 (17:24 +0100)]
Sync welcome-message-800

12 years agoadd webPassword
Martin Zobel-Helas [Sun, 19 Feb 2012 13:48:03 +0000 (14:48 +0100)]
add webPassword

12 years agoadd webPassword
Martin Zobel-Helas [Sun, 19 Feb 2012 13:46:24 +0000 (14:46 +0100)]
add webPassword

12 years agoMerge branch 'master' of ssh://db.debian.org/git/userdir-ldap
Stephen Gran [Thu, 29 Dec 2011 21:23:11 +0000 (21:23 +0000)]
Merge branch 'master' of ssh://db.debian.org/git/userdir-ldap

12 years agoFix some usages of hardcoded debian.org
Stephen Gran [Thu, 29 Dec 2011 21:22:45 +0000 (21:22 +0000)]
Fix some usages of hardcoded debian.org
Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoUpdate to match live slapd.conf
Stephen Gran [Thu, 29 Dec 2011 21:21:00 +0000 (21:21 +0000)]
Update to match live slapd.conf
Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoud-replicate: now preserve server side modifcation times when rsyncing data
Peter Palfrader [Thu, 29 Dec 2011 21:06:23 +0000 (22:06 +0100)]
ud-replicate: now preserve server side modifcation times when rsyncing data

12 years agofix breaking old ud-generate locks.
Peter Palfrader [Thu, 29 Dec 2011 20:55:21 +0000 (21:55 +0100)]
fix breaking old ud-generate locks.

12 years agoud-replicate: do not hard-code 'debian.org' in the 'write-zonefile debian.org' call...
Peter Palfrader [Wed, 2 Nov 2011 22:42:06 +0000 (23:42 +0100)]
ud-replicate: do not hard-code 'debian.org' in the 'write-zonefile debian.org' call, but instead re-use the domain from email-append.

12 years agowhy does python not believe in variable scoping, but then complain about it?
Stephen Gran [Fri, 26 Aug 2011 19:26:15 +0000 (19:26 +0000)]
why does python not believe in variable scoping, but then complain about it?

Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agommmm, that's likely to be a namespace clash
Stephen Gran [Sat, 20 Aug 2011 16:19:24 +0000 (17:19 +0100)]
mmmm, that's likely to be a namespace clash
Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoWe need to use an actually defined variable name
Stephen Gran [Sat, 20 Aug 2011 15:55:59 +0000 (15:55 +0000)]
We need to use an actually defined variable name
Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoud-mailgate: only run ldapmodfiy if we actually have attributes to modify.
Peter Palfrader [Mon, 15 Aug 2011 19:52:42 +0000 (21:52 +0200)]
ud-mailgate: only run ldapmodfiy if we actually have attributes to modify.

12 years agoAdd slapo-constaint for keyfingerprint
Faidon Liambotis [Sun, 14 Aug 2011 13:23:01 +0000 (16:23 +0300)]
Add slapo-constaint for keyfingerprint

12 years agoMake ud-generate pull the last modification time out of ldap and only
Stephen Gran [Fri, 29 Jul 2011 16:24:52 +0000 (16:24 +0000)]
Make ud-generate pull the last modification time out of ldap and only
run if ldap has been updated.  We have some more architecture work to do
before this can go live without making the monitoring go insane.
Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoand changelog too
Stephen Gran [Thu, 9 Jun 2011 19:28:29 +0000 (19:28 +0000)]
and changelog too

Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoupdate Net::LDAP import
Stephen Gran [Thu, 9 Jun 2011 19:28:07 +0000 (19:28 +0000)]
update Net::LDAP import

Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoand some changelog
Stephen Gran [Thu, 9 Jun 2011 17:52:36 +0000 (17:52 +0000)]
and some changelog

Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agomore sha module
Stephen Gran [Thu, 9 Jun 2011 17:47:12 +0000 (17:47 +0000)]
more sha module

Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoget rid of most uses of sha module
Stephen Gran [Thu, 9 Jun 2011 17:17:46 +0000 (17:17 +0000)]
get rid of most uses of sha module

Signed-off-by: Stephen Gran <steve@lobefin.net>
12 years agoHandle capital {CRYPT} in userpasswd
Peter Palfrader [Sat, 21 May 2011 14:50:21 +0000 (16:50 +0200)]
Handle capital {CRYPT} in userpasswd

12 years agoFilter on shadowAccount
Peter Palfrader [Sat, 21 May 2011 14:42:41 +0000 (16:42 +0200)]
Filter on shadowAccount

12 years agono userpassword means locked.
Peter Palfrader [Sat, 21 May 2011 14:42:02 +0000 (16:42 +0200)]
no userpassword means locked.

12 years agonaming your variable like a module is unsmart
Peter Palfrader [Sat, 21 May 2011 14:03:21 +0000 (16:03 +0200)]
naming your variable like a module is unsmart