diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-10-25 17:26:58 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-10-25 17:26:58 +0000 |
| commit | 7e4f1553660bcd9dac2df36a6fdc12e78703c775 (patch) | |
| tree | a9848f7593153ec3d97c1d43393a870d13dc0f82 | |
| parent | 6db12a2349bf948ec00d3896f1c67478ea72c4f8 (diff) | |
| download | puppet-7e4f1553660bcd9dac2df36a6fdc12e78703c775.tar puppet-7e4f1553660bcd9dac2df36a6fdc12e78703c775.tar.gz puppet-7e4f1553660bcd9dac2df36a6fdc12e78703c775.tar.bz2 puppet-7e4f1553660bcd9dac2df36a6fdc12e78703c775.tar.xz puppet-7e4f1553660bcd9dac2df36a6fdc12e78703c775.zip | |
fix authentication
| -rw-r--r-- | deployment/wikis/templates/wiki_vhost.conf | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/deployment/wikis/templates/wiki_vhost.conf b/deployment/wikis/templates/wiki_vhost.conf index 38e47a44..d8618873 100644 --- a/deployment/wikis/templates/wiki_vhost.conf +++ b/deployment/wikis/templates/wiki_vhost.conf @@ -1,17 +1,18 @@ <Directory <%= wikis_root %>> Options +FollowSymLinks + + AuthUserFile /srv/passwd-wiki + AuthType Basic + AuthName "Mageia wiki" + <LIMIT GET POST PUT> + require valid-user + </LIMIT> + </Directory> RewriteEngine On RewriteRule ^/?$ /en/ [R] -AuthUserFile /srv/passwd-wiki -AuthType Basic -AuthName "Mageia wiki" -<LIMIT GET POST PUT> - require valid-user -</LIMIT> - <%- for lang in wiki_languages -%> Alias /<%= lang %> <%= wikis_root %>/<%= lang %>/index.php |