From e625d57308bddda149bf123e4305d5fe3e6bb81b Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Sat, 22 Oct 2011 23:55:54 +0000 Subject: define wiki vhost in deployement/wikis --- deployment/wikis/manifests/init.pp | 13 +++++++++++++ deployment/wikis/templates/wiki_vhost.conf | 14 ++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 deployment/wikis/templates/wiki_vhost.conf (limited to 'deployment/wikis') diff --git a/deployment/wikis/manifests/init.pp b/deployment/wikis/manifests/init.pp index 2198e557..e37bb74a 100644 --- a/deployment/wikis/manifests/init.pp +++ b/deployment/wikis/manifests/init.pp @@ -1,12 +1,25 @@ class wikis { + $wikis_root = '/srv/wiki' 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, } + $wiki_languages = [ 'en', 'fr' ] mediawiki::instance { "en": title => "Mageia wiki", wiki_settings => template('wikis/wiki_settings'), } + + apache::vhost_redirect_ssl { "wiki.$domain": } + + apache::vhost_base { "ssl_wiki.$domain": + location => '/dev/null', + use_ssl => true, + vhost => "wiki.$domain", + content => template("wiki/wiki_vhost.conf"), + } } diff --git a/deployment/wikis/templates/wiki_vhost.conf b/deployment/wikis/templates/wiki_vhost.conf new file mode 100644 index 00000000..28f59ad3 --- /dev/null +++ b/deployment/wikis/templates/wiki_vhost.conf @@ -0,0 +1,14 @@ +> + Options +FollowSymLinks + + +RewriteEngine On +RewriteRule ^/?$ /en/ [R] + +<%- for lang in wiki_languages -%> + +Alias /<%= lang %> <%= wikis_root %>/<%= lang %>/index.php +Alias /mw-<%= lang %> <%= wikis_root %>/<%= lang %> + +<%- end -%> + -- cgit v1.2.1