aboutsummaryrefslogtreecommitdiffstats
path: root/modules/transifex
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-02-23 16:47:12 +0000
committerMichael Scherer <misc@mageia.org>2011-02-23 16:47:12 +0000
commita28b599f893057aca96270fd138bd1042f8d4a8c (patch)
treec4445e94afa818252f853096efadf2ff5da2a5b4 /modules/transifex
parentd28b4f664c69e97c7615d6aafcf4141b4f63f342 (diff)
downloadpuppet-a28b599f893057aca96270fd138bd1042f8d4a8c.tar
puppet-a28b599f893057aca96270fd138bd1042f8d4a8c.tar.gz
puppet-a28b599f893057aca96270fd138bd1042f8d4a8c.tar.bz2
puppet-a28b599f893057aca96270fd138bd1042f8d4a8c.tar.xz
puppet-a28b599f893057aca96270fd138bd1042f8d4a8c.zip
finish the move to django_application common class
Diffstat (limited to 'modules/transifex')
-rw-r--r--modules/transifex/files/custom_backend.py9
-rw-r--r--modules/transifex/manifests/init.pp14
2 files changed, 2 insertions, 21 deletions
diff --git a/modules/transifex/files/custom_backend.py b/modules/transifex/files/custom_backend.py
deleted file mode 100644
index 828744fb..00000000
--- a/modules/transifex/files/custom_backend.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-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]
-
-
diff --git a/modules/transifex/manifests/init.pp b/modules/transifex/manifests/init.pp
index d3d2ead2..1a643871 100644
--- a/modules/transifex/manifests/init.pp
+++ b/modules/transifex/manifests/init.pp
@@ -1,6 +1,6 @@
class transifex {
-
- package { ['transifex','python-psycopg2','python-django-auth-ldap']:
+ include django_application
+ package { 'transifex':
ensure => installed
}
@@ -74,16 +74,6 @@ class transifex {
notify => Service['apache']
}
- file { "custom_backend.py":
- path => "/usr/local/lib/custom_backend.py",
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
- source => "puppet:///modules/transifex/custom_backend.py",
- notify => Service['apache']
- }
-
subversion::snapshot { $templates_dir:
source => "svn://svn.mageia.org/svn/web/templates/transifex/trunk"
}