diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2010-December/001250.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2010-December/001250.html | 142 |
1 files changed, 142 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2010-December/001250.html b/zarb-ml/mageia-sysadm/2010-December/001250.html new file mode 100644 index 000000000..5a3bb8cac --- /dev/null +++ b/zarb-ml/mageia-sysadm/2010-December/001250.html @@ -0,0 +1,142 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [632] allow to use email on log on transifex + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B632%5D%20allow%20to%20use%20email%20on%20log%20on%20transifex&In-Reply-To=%3C20101215212426.A4D8140328%40valstar.mageia.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="001249.html"> + <LINK REL="Next" HREF="001251.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [632] allow to use email on log on transifex</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B632%5D%20allow%20to%20use%20email%20on%20log%20on%20transifex&In-Reply-To=%3C20101215212426.A4D8140328%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [632] allow to use email on log on transifex">root at mageia.org + </A><BR> + <I>Wed Dec 15 22:24:26 CET 2010</I> + <P><UL> + <LI>Previous message: <A HREF="001249.html">[Mageia-sysadm] [631] - fix again, not a good day for me :/ +</A></li> + <LI>Next message: <A HREF="001251.html">[Mageia-sysadm] MeetBot's Inigo_Montoya is not avaible for #mageia-tr +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#1250">[ date ]</a> + <a href="thread.html#1250">[ thread ]</a> + <a href="subject.html#1250">[ subject ]</a> + <a href="author.html#1250">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 632 +Author: misc +Date: 2010-12-15 22:24:26 +0100 (Wed, 15 Dec 2010) +Log Message: +----------- +allow to use email on log on transifex + +Modified Paths: +-------------- + puppet/modules/transifex/manifests/init.pp + puppet/modules/transifex/templates/45-ldap.conf + +Added Paths: +----------- + puppet/modules/transifex/files/ + puppet/modules/transifex/files/custom_backend.py + +Added: puppet/modules/transifex/files/custom_backend.py +=================================================================== +--- puppet/modules/transifex/files/custom_backend.py (rev 0) ++++ puppet/modules/transifex/files/custom_backend.py 2010-12-15 21:24:26 UTC (rev 632) +@@ -0,0 +1,9 @@ ++ ++from django_auth_ldap.backend import LDAPBackend,_LDAPUser ++ ++class ForceUidLDAPBackend(LDAPBackend): ++ def ldap_to_django_username(self, username): ++ # force uid if someone give a email ++ return _LDAPUser(self, username=username).attrs['uid'][0] ++ ++ + +Modified: puppet/modules/transifex/manifests/init.pp +=================================================================== +--- puppet/modules/transifex/manifests/init.pp 2010-12-15 16:15:46 UTC (rev 631) ++++ puppet/modules/transifex/manifests/init.pp 2010-12-15 21:24:26 UTC (rev 632) +@@ -74,6 +74,16 @@ + notify => Service['apache'] + } + ++ file { "custom_backend.py": ++ path => "/usr/local/lib/custom_backend.py", ++ ensure => present, ++ owner => root, ++ group => root, ++ mode => 644, ++ source => "<A HREF="puppet:///modules/transifex/custom_backend.py">puppet:///modules/transifex/custom_backend.py</A>", ++ notify => Service['apache'] ++ } ++ + subversion::snapshot { $templates_dir: + source => "<A HREF="svn://svn.mageia.org/svn/web/templates/transifex/trunk">svn://svn.mageia.org/svn/web/templates/transifex/trunk</A>" + } +@@ -81,7 +91,7 @@ + apache::vhost_django_app { "transifex.$domain": + module => "transifex", + use_ssl => true, +- module_path => ["/usr/share/transifex","/usr/share"] ++ module_path => ["/usr/share/transifex","/usr/share","/usr/local/lib/"] + } + + apache::vhost_redirect_ssl { "transifex.$domain": } + +Modified: puppet/modules/transifex/templates/45-ldap.conf +=================================================================== +--- puppet/modules/transifex/templates/45-ldap.conf 2010-12-15 16:15:46 UTC (rev 631) ++++ puppet/modules/transifex/templates/45-ldap.conf 2010-12-15 21:24:26 UTC (rev 632) +@@ -1,5 +1,5 @@ + AUTHENTICATION_BACKENDS = ( +- 'django_auth_ldap.backend.LDAPBackend', ++ 'custom_backend.ForceUidLDAPBackend', + 'django.contrib.auth.backends.ModelBackend', + ) + +@@ -23,7 +23,7 @@ + AUTH_LDAP_BIND_PASSWORD = "<%= ldap_password %>" + + AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= dc_suffix %> ", +- ldap.SCOPE_SUBTREE, "(uid=%(user)s)") ++ ldap.SCOPE_SUBTREE, "(|(uid=%(user)s)(mail=%(user)s))") + + # Set up the basic group parameters. + AUTH_LDAP_GROUP_SEARCH = LDAPSearch("ou=Group,<%= dc_suffix %>", +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20101215/6212bd03/attachment.html> +</PRE> + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="001249.html">[Mageia-sysadm] [631] - fix again, not a good day for me :/ +</A></li> + <LI>Next message: <A HREF="001251.html">[Mageia-sysadm] MeetBot's Inigo_Montoya is not avaible for #mageia-tr +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#1250">[ date ]</a> + <a href="thread.html#1250">[ thread ]</a> + <a href="subject.html#1250">[ subject ]</a> + <a href="author.html#1250">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm +mailing list</a><br> +</body></html> |