diff options
| author | Michael Scherer <misc@mageia.org> | 2011-03-22 17:43:44 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-03-22 17:43:44 +0000 |
| commit | 491f81e3a43ec3429be5d6c79ceda98674dbe62d (patch) | |
| tree | 187ab1466c599192397e4c389c859306724c6af3 /modules/sympa | |
| parent | 87385d8f2d744d1896be2a4d23321a67473c1fe8 (diff) | |
| download | puppet-491f81e3a43ec3429be5d6c79ceda98674dbe62d.tar puppet-491f81e3a43ec3429be5d6c79ceda98674dbe62d.tar.gz puppet-491f81e3a43ec3429be5d6c79ceda98674dbe62d.tar.bz2 puppet-491f81e3a43ec3429be5d6c79ceda98674dbe62d.tar.xz puppet-491f81e3a43ec3429be5d6c79ceda98674dbe62d.zip | |
use the new type for user and database declaration ( will be used later for pg access list )
Diffstat (limited to 'modules/sympa')
| -rw-r--r-- | modules/sympa/manifests/init.pp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp index 58d6baaf..4dd8ca15 100644 --- a/modules/sympa/manifests/init.pp +++ b/modules/sympa/manifests/init.pp @@ -25,10 +25,11 @@ class sympa { $pgsql_password = extlookup("sympa_pgsql",'x') $ldap_password = extlookup("sympa_ldap",'x') - postgresql::remote_user { 'sympa': + postgresql::remote_db_and_user { 'sympa': password => $pgsql_password, + description => "Sympa database", } - + file { '/etc/sympa/sympa.conf': ensure => present, # should be cleaner to have it root owned, but puppet do not support acl @@ -60,12 +61,7 @@ class sympa { use_ssl => true, content => template("sympa/vhost_ml.conf"), } - - postgresql::remote_database { 'sympa': - description => "Sympa database", - user => "sympa", - } - + subversion::snapshot { "/etc/sympa/web_tt2": source => "svn://svn.mageia.org/svn/web/templates/sympa/trunk" } |