diff options
| author | Michael Scherer <misc@mageia.org> | 2012-02-10 14:19:57 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-02-10 14:19:57 +0000 |
| commit | 6839ddc88d33395ce2689484efab37f446f9b6ff (patch) | |
| tree | bfa2c15dc98757ac6d800e960d0f086c3948d4f7 /deployment/wikis | |
| parent | 3202079ca8eb5b579da149e61d78e6ce70ab46e4 (diff) | |
| download | puppet-6839ddc88d33395ce2689484efab37f446f9b6ff.tar puppet-6839ddc88d33395ce2689484efab37f446f9b6ff.tar.gz puppet-6839ddc88d33395ce2689484efab37f446f9b6ff.tar.bz2 puppet-6839ddc88d33395ce2689484efab37f446f9b6ff.tar.xz puppet-6839ddc88d33395ce2689484efab37f446f9b6ff.zip | |
clean, and make puppet-lint silent
Diffstat (limited to 'deployment/wikis')
| -rw-r--r-- | deployment/wikis/manifests/init.pp | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/deployment/wikis/manifests/init.pp b/deployment/wikis/manifests/init.pp index 3f0bdcfe..9db58b73 100644 --- a/deployment/wikis/manifests/init.pp +++ b/deployment/wikis/manifests/init.pp @@ -1,31 +1,30 @@ class wikis { $wikis_root = '/srv/wiki' $wikis_templates = '/srv/wiki-templates' - class { "mediawiki::config": - pgsql_password => extlookup("mediawiki_pgsql",'x'), - secretkey => extlookup("mediawiki_secretkey",'x'), - ldap_password => extlookup('mediawiki_ldap','x'), - root => $wikis_root, - vhost => false, + class { 'mediawiki::config': + pgsql_password => extlookup('mediawiki_pgsql','x'), + secretkey => extlookup('mediawiki_secretkey','x'), + ldap_password => extlookup('mediawiki_ldap','x'), + root => $wikis_root, + vhost => false, } subversion::snapshot { $wikis_templates: - source => "svn://svn.$domain/svn/web/templates/mediawiki" + source => "svn://svn.$::domain/svn/web/templates/mediawiki" } $wiki_languages = [ 'en' ] - mediawiki::instance { "en": - title => "Mageia wiki", - wiki_settings => template('wikis/wiki_settings'), - skinsdir => "$wikis_templates/skins", + mediawiki::instance { 'en': + title => 'Mageia wiki', + wiki_settings => template('wikis/wiki_settings'), + skinsdir => "$wikis_templates/skins", } - apache::vhost_redirect_ssl { "wiki.$domain": } + apache::vhost_redirect_ssl { "wiki.$::domain": } - apache::vhost_base { "ssl_wiki.$domain": - location => '/dev/null', - use_ssl => true, - vhost => "wiki.$domain", - content => template("wikis/wiki_vhost.conf"), + apache::vhost_base { "ssl_wiki.$::domain": + use_ssl => true, + vhost => "wiki.$::domain", + content => template('wikis/wiki_vhost.conf'), } } |