aboutsummaryrefslogtreecommitdiffstats
path: root/modules/transifex
diff options
context:
space:
mode:
Diffstat (limited to 'modules/transifex')
-rw-r--r--modules/transifex/manifests/init.pp96
-rw-r--r--modules/transifex/templates/20-engines.conf6
-rw-r--r--modules/transifex/templates/30-site.conf2
-rw-r--r--modules/transifex/templates/40-apps.conf1
-rw-r--r--modules/transifex/templates/45-ldap.conf16
-rw-r--r--modules/transifex/templates/50-project.conf6
6 files changed, 63 insertions, 64 deletions
diff --git a/modules/transifex/manifests/init.pp b/modules/transifex/manifests/init.pp
index d378e1b2..282b3f9a 100644
--- a/modules/transifex/manifests/init.pp
+++ b/modules/transifex/manifests/init.pp
@@ -2,61 +2,61 @@ class transifex {
include django_application
package { 'transifex': }
-
- $pgsql_password = extlookup("transifex_pgsql",'x')
- $ldap_password = extlookup("transifex_ldap",'x')
- $templates_dir = "/var/lib/transifex/templates"
+ $pgsql_password = extlookup('transifex_pgsql','x')
+ $ldap_password = extlookup('transifex_ldap','x')
+
+ $templates_dir = '/var/lib/transifex/templates'
postgresql::remote_db_and_user { 'transifex':
- description => "Transifex database",
- password => $pgsql_password,
+ description => 'Transifex database',
+ password => $pgsql_password,
}
define config() {
$filename = $name
- file { "/etc/transifex/$filename":
- group => apache,
- mode => 640,
+ file { "/etc/transifex/${filename}":
+ group => 'apache',
+ mode => '0640',
require => Package['transifex'],
- notify => Service['apache'],
- content => template("transifex/$filename"),
+ notify => Service['apache'],
+ content => template("transifex/${filename}"),
}
}
- config { [ "20-engines.conf",
- "30-site.conf",
- "40-apps.conf",
- "45-ldap.conf",
- "50-project.conf"]: }
+ config { ['20-engines.conf',
+ '30-site.conf',
+ '40-apps.conf',
+ '45-ldap.conf',
+ '50-project.conf']: }
- subversion::snapshot { $templates_dir:
- source => "svn://svn.mageia.org/svn/web/templates/transifex/trunk"
+ git::snapshot { $templates_dir:
+ source => "git://git.${::domain}/web/templates/transifex"
}
- apache::vhost_django_app { "transifex.$domain":
- module => "transifex",
- use_ssl => true,
- module_path => ["/usr/share/transifex","/usr/share","/usr/local/lib/"],
- aliases => { "/site_media/static/admin/" => "/usr/lib/python2.6/site-packages/django/contrib/admin/media/", },
+ apache::vhost::django_app { "transifex.${::domain}":
+ module => 'transifex',
+ use_ssl => true,
+ module_path => ['/usr/share/transifex','/usr/share','/usr/local/lib/'],
+ aliases => { '/site_media/static/admin/' => '/usr/lib/python2.6/site-packages/django/contrib/admin/media/', },
}
# tx need write access there when running in apache
- file { "/var/lib/transifex/scratchdir/storage_files":
- ensure => directory,
- owner => apache,
- group => apache,
+ file { '/var/lib/transifex/scratchdir/storage_files':
+ ensure => directory,
+ owner => 'apache',
+ group => 'apache',
require => Package['transifex'],
}
- apache::vhost_redirect_ssl { "transifex.$domain": }
+ apache::vhost::redirect_ssl { "transifex.${::domain}": }
# the group are mapped from ldap, since AUTH_LDAP_FIND_GROUP_PERMS is set to yes
# but the group need to exist in django first
- django_application::create_group { ["mga-i18n","mga-i18n-committers"]:
- module => "transifex",
- path => "/usr/share/transifex:/usr/share",
+ django_application::create_group { ['mga-i18n','mga-i18n-committers']:
+ module => 'transifex',
+ path => '/usr/share/transifex:/usr/share',
}
define committers_permission($app='')
@@ -65,25 +65,25 @@ class transifex {
# if we install a 2nd django application with the same permission name ( as it need
# to be unique )
django_application::add_permission_to_group { $name:
- app => $app,
- group => 'mga-i18n-committers',
- module => "transifex",
- path => "/usr/share/transifex:/usr/share",
+ app => $app,
+ group => 'mga-i18n-committers',
+ module => 'transifex',
+ path => '/usr/share/transifex:/usr/share',
require => Django_application::Create_group['mga-i18n-committers'],
}
}
-
- committers_permission { ['add_project',
- 'change_project',
- 'delete_project']: }
-
- committers_permission { ['add_release',
- 'change_release',
- 'delete_release']: }
-
- committers_permission { ['add_resource',
- 'change_resource',
- 'delete_resource']:
- app => "resources",
+
+ committers_permission {['add_project',
+ 'change_project',
+ 'delete_project']: }
+
+ committers_permission {['add_release',
+ 'change_release',
+ 'delete_release']: }
+
+ committers_permission {['add_resource',
+ 'change_resource',
+ 'delete_resource']:
+ app => 'resources',
}
}
diff --git a/modules/transifex/templates/20-engines.conf b/modules/transifex/templates/20-engines.conf
index 13eb0334..620a9556 100644
--- a/modules/transifex/templates/20-engines.conf
+++ b/modules/transifex/templates/20-engines.conf
@@ -3,14 +3,14 @@
## Database configuration
-# http://docs.djangoproject.com/en/dev/ref/settings/#database-engine
+# https://docs.djangoproject.com/en/dev/ref/settings/#database-engine
DATABASE_ENGINE = 'postgresql_psycopg2'
# Use file path for sqlite3
DATABASE_NAME = 'transifex'
# The following are not used for sqlite3
DATABASE_USER = 'transifex'
-DATABASE_PASSWORD = '<%= pgsql_password %>'
-DATABASE_HOST = 'pgsql.<%= domain %>' # Set to empty string for local socket
+DATABASE_PASSWORD = '<%= @pgsql_password %>'
+DATABASE_HOST = 'pgsql.<%= @domain %>' # Set to empty string for local socket
DATABASE_PORT = '' # Set to empty string for default
## Caching (optional)
diff --git a/modules/transifex/templates/30-site.conf b/modules/transifex/templates/30-site.conf
index 4d4e9e4c..3c386354 100644
--- a/modules/transifex/templates/30-site.conf
+++ b/modules/transifex/templates/30-site.conf
@@ -1,7 +1,7 @@
# Sites
SITE_ID = 1
# Your site's domain. This is used only in this file.
-SITE_DOMAIN = '<%= domain %>'
+SITE_DOMAIN = '<%= @domain %>'
ADMINS = (
# ('Your Name', 'your_email@domain.com'),
diff --git a/modules/transifex/templates/40-apps.conf b/modules/transifex/templates/40-apps.conf
index fe1d0492..dd92fb1c 100644
--- a/modules/transifex/templates/40-apps.conf
+++ b/modules/transifex/templates/40-apps.conf
@@ -56,4 +56,3 @@ AJAX_LOOKUP_CHANNELS = {
'projects' : ('projects.lookups', 'ProjectsLookup'),
'resources' : ('resources.lookups', 'ResourcesLookup'),
}
-
diff --git a/modules/transifex/templates/45-ldap.conf b/modules/transifex/templates/45-ldap.conf
index dd215dc9..2532edf5 100644
--- a/modules/transifex/templates/45-ldap.conf
+++ b/modules/transifex/templates/45-ldap.conf
@@ -17,16 +17,16 @@ from django_auth_ldap.config import LDAPSearch, GroupOfNamesType
# Baseline configuration.
-AUTH_LDAP_SERVER_URI = "ldap://ldap.<%= domain %> ldap://ldap-slave-1.<%= domain %>"
+AUTH_LDAP_SERVER_URI = "ldap://ldap.<%= @domain %> ldap://ldap-slave-1.<%= @domain %>"
-AUTH_LDAP_BIND_DN = "cn=transifex-<%= hostname %>,ou=System Accounts,<%= dc_suffix %>"
-AUTH_LDAP_BIND_PASSWORD = "<%= ldap_password %>"
+AUTH_LDAP_BIND_DN = "cn=transifex-<%= @hostname %>,ou=System Accounts,<%= @dc_suffix %>"
+AUTH_LDAP_BIND_PASSWORD = "<%= @ldap_password %>"
-AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= dc_suffix %> ",
+AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= @dc_suffix %> ",
ldap.SCOPE_SUBTREE, "(|(uid=%(user)s)(mail=%(user)s))")
# Set up the basic group parameters.
-AUTH_LDAP_GROUP_SEARCH = LDAPSearch("ou=Group,<%= dc_suffix %>",
+AUTH_LDAP_GROUP_SEARCH = LDAPSearch("ou=Group,<%= @dc_suffix %>",
ldap.SCOPE_SUBTREE, "(objectClass=groupOfNames)"
)
AUTH_LDAP_GROUP_TYPE = GroupOfNamesType(name_attr="cn")
@@ -42,7 +42,7 @@ AUTH_LDAP_USER_ATTR_MAP = {
}
AUTH_LDAP_USER_FLAGS_BY_GROUP = {
- "is_active": "cn=mga-i18n,ou=Group,<%= dc_suffix %>",
- "is_staff": "cn=mga-i18n-committers,ou=Group,<%= dc_suffix %>",
- "is_superuser": "cn=mga-sysadmin,ou=Group,<%= dc_suffix %>"
+ "is_active": "cn=mga-i18n,ou=Group,<%= @dc_suffix %>",
+ "is_staff": "cn=mga-i18n-committers,ou=Group,<%= @dc_suffix %>",
+ "is_superuser": "cn=mga-sysadmin,ou=Group,<%= @dc_suffix %>"
}
diff --git a/modules/transifex/templates/50-project.conf b/modules/transifex/templates/50-project.conf
index ddbcd2b7..013741b2 100644
--- a/modules/transifex/templates/50-project.conf
+++ b/modules/transifex/templates/50-project.conf
@@ -33,14 +33,14 @@ MIDDLEWARE_CLASSES = [
'django.middleware.doc.XViewMiddleware',
'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
'django_sorting.middleware.SortingMiddleware',
- 'django.middleware.transaction.TransactionMiddleware',
+# 'django.middleware.transaction.TransactionMiddleware',
'pagination.middleware.PaginationMiddleware',
]
ROOT_URLCONF = 'urls'
TEMPLATE_DIRS = [
- '<%= templates_dir %>',
+ '<%= @templates_dir %>',
os.path.join(TX_ROOT, 'templates'),
]
@@ -68,7 +68,7 @@ INSTALLED_APPS = [
'authority',
# Transifex specific apps:
'transifex.txcommon',
- # It's coming here due http://trac.transifex.org/ticket/596
+ # It's coming here due https://trac.transifex.org/ticket/596
'userprofile',
'transifex.languages',
'transifex.projects',
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-24 17:15:05 +0000