/[adm]/puppet/modules/mediawiki/manifests/init.pp
ViewVC logotype

Diff of /puppet/modules/mediawiki/manifests/init.pp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2031 by misc, Mon Jun 20 02:14:06 2011 UTC revision 2032 by boklm, Mon Oct 10 13:39:39 2011 UTC
# Line 1  Line 1 
1  class mediawiki {  class mediawiki {
2        class config($pgsql_password, $secretkey, $ldap_password) {
3        }
4    
5      class base {      class base {
6    
7          $root = "/srv/wiki/"          $root = "/srv/wiki/"
# Line 23  class mediawiki { Line 26  class mediawiki {
26    
27          $user = "mediawiki"          $user = "mediawiki"
28    
         $pgsql_password = extlookup("mediawiki_pgsql",'x')  
29          postgresql::remote_user { $user:          postgresql::remote_user { $user:
30              password => $pgsql_password,              password => $config::pgsql_password,
31          }          }
32    
33          # TODO create the ldap user            # TODO create the ldap user  
# Line 59  class mediawiki { Line 61  class mediawiki {
61          $wiki_root = "$mediawiki::base::root/$path"          $wiki_root = "$mediawiki::base::root/$path"
62          $db_name = "mediawiki_$name"          $db_name = "mediawiki_$name"
63          $db_user = "$mediawiki::base::user"          $db_user = "$mediawiki::base::user"
64          $db_password = "$mediawiki::base::pgsql_password"          $db_password = "$mediawiki::config::pgsql_password"
65          $secret_key = extlookup("mediawiki_secretkey",'x')          $secret_key = "$mediawiki::config::secretkey"
66    
67          file { "$wiki_root":          file { "$wiki_root":
68              ensure => directory              ensure => directory
# Line 83  class mediawiki { Line 85  class mediawiki {
85              refreshonly => true,              refreshonly => true,
86              onlyif => "test -d $wiki_root/config",              onlyif => "test -d $wiki_root/config",
87          }          }
88          $ldap_password = extlookup('mediawiki_ldap','x')          $ldap_password = $config::ldap_password
89    
90          file { "$wiki_root/LocalSettings.php":          file { "$wiki_root/LocalSettings.php":
91              ensure => present,              ensure => present,
Legend:
Removed from v.2031  
changed lines
  Added in v.2032
  ViewVC Help
Powered by ViewVC 1.1.30