diff options
author | Michael Scherer <misc@mageia.org> | 2012-03-19 21:55:02 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-03-19 21:55:02 +0000 |
commit | 0d2c2d30b6b4927174b419143e3ef24ddcc10573 (patch) | |
tree | 0187d385dd076272b62c4e757075c514a17d2ca4 /modules/transifex/manifests | |
parent | f1204663577a30de5d853c80ad0c6bdd7847b50f (diff) | |
download | puppet-0d2c2d30b6b4927174b419143e3ef24ddcc10573.tar puppet-0d2c2d30b6b4927174b419143e3ef24ddcc10573.tar.gz puppet-0d2c2d30b6b4927174b419143e3ef24ddcc10573.tar.bz2 puppet-0d2c2d30b6b4927174b419143e3ef24ddcc10573.tar.xz puppet-0d2c2d30b6b4927174b419143e3ef24ddcc10573.zip |
various ident and style cleaning to make our dear puppet-lint happy
Diffstat (limited to 'modules/transifex/manifests')
-rw-r--r-- | modules/transifex/manifests/init.pp | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/modules/transifex/manifests/init.pp b/modules/transifex/manifests/init.pp index d378e1b2..63383734 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') + + $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, + group => 'apache', + mode => '0640', require => Package['transifex'], - notify => Service['apache'], + 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" + source => 'svn://svn.mageia.org/svn/web/templates/transifex/trunk' } - 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', } } |