supprimé
[cyclowiki.git] / ikiwiki.setup
index cf9970f..e6ef777 100644 (file)
@@ -5,10 +5,13 @@ BEGIN {
        use File::Basename;
        use File::Spec::Functions;
        my $srcdir = dirname($IkiWiki::config{'setupfile'});
-       my ($wiki, $wikiname, $destdir, $global_sidebars, $search_db, $userdir);
+       my ($wiki, $wikiname, $git_repo, $destdir
+        , $global_sidebars, $search_db, $userdir,
+        , $only_committed_changes);
        if (-x "$srcdir/Public") {
                $wiki = '3615';
                $wikiname = '3615';
+               $git_repo = '3615cyclo';
                $destdir = $srcdir.'-www';
                $global_sidebars =
                 [
@@ -24,14 +27,15 @@ BEGIN {
                                and !Public/templates
                                and !Public/templates/*'
                 ];
-               $userdir = '/Public/Camarade';
+               $userdir = '/Camarade';
         }
        else {
                $wiki = 'wiki';
                $wikiname = 'CycloWiki';
+               $git_repo = 'cyclowiki';
                $destdir = $srcdir.'-www';
                $global_sidebars =
-                [ "PREVISION_DU_BENEVOLAT", "/Savoir-faire/Autogestion/Bénévolat/Prévision", "index"
+                [ #"PREVISION_DU_BENEVOLAT", "/Savoir-faire/Autogestion/Bénévolat/Prévision", "index"
                 ];
                $search_db = # db, auth required, page having the search, pages indexed
                 [ 'wiki', 0
@@ -57,6 +61,7 @@ BEGIN {
                $umask     = 002;
                $url       = '/';
                $urls      = "https://$wiki.cyclocoop.org/";
+               $only_committed_changes = 1;
                @wrappers  =
                 ( { cgi => 1
                         , wrapper => $destdir."/cgi/ikiwiki.cgi"
@@ -78,6 +83,7 @@ BEGIN {
                $umask     = 002;
                $url       = '/';
                $urls      = '/';
+               $only_committed_changes = 0;
                @wrappers  =
                 ( { cgi => 1
                         , wrapper => $destdir."/cgi/ikiwiki.cgi"
@@ -91,6 +97,7 @@ BEGIN {
        %setup_args =
         ( ENV => {}
         , account_creation_password => $account_creation_password
+        , default_plugins => []
         , add_plugins => [qw{
                 404
                 action
@@ -98,8 +105,11 @@ BEGIN {
                 attachment
                 brokenlinks
                 comments
+                conditional
+                createpage
                 cutpaste
                 editdiff
+                editpage
                 events
                 favicon
                 img
@@ -107,10 +117,14 @@ BEGIN {
                 link
                 linkmap
                 map
+                mdwn
+                meta
                 moderatedcomments
                 orphans
                 pagecount
                 pagestats
+                pagetemplate
+                parentlinks_fixed
                 passwordauth
                 poll
                 progress
@@ -122,24 +136,62 @@ BEGIN {
                 search
                 sidebar2
                 signinedit
+                signinedit
                 table
                 tag
                 template
                 theme
                 toc
+                toggle
                 trail
                 userlist
                 }]
         #, add_underlays => []
         , adminemail => 'admin+'."$wiki".'@cyclocoop.org'
         , adminuser => [qw{
+                       Aline
+                       Amélie
+                       Andréas
                        anne-lise
+                       Arnaud
+                       Carmel
+                       Cecile
+                       Corentin
+                       David
+                       Galileo
                        Giampiero
+                       giampiero
+                       Giulia
+                       Giuso
+                       Greg
+                       Java
+                       Julien
                        julm
+                       Louan
+                       Marie
+                       marie
+                       Martin
+                       Mathilde
+                       Nico13
                        Nicolas
+                       Pedro
+                       Romain
                        Severine
+                       Séverine
+                       simoarrivo
+                       Shems
+                       Stef
+                       Stéphane
+                       stéphane
                        Tania
+                       tania
+                       Thai
+                       Thomas
+                       Thong
+                       Tilman
                        tilman
+                       Una
+                       Valérie
                 }]
         #, aggregate_webtrigger => 0
         #, aggregateinternal => 1
@@ -181,26 +233,27 @@ BEGIN {
         , comments_closed_pagespec => 'index or blog/controversial or blog/flamewar'
         , comments_commit => 1
         , comments_pagename => 'comment_'
-        , comments_pagespec => '(Agenda/*/*/* or Presse/*/*/* or vélo/*) and !*/Discussion'
+        , comments_pagespec => '(Agenda/*/*/* or Document/*/*/* or Presse/*/*/* or vélo/*) and !*/Discussion'
         , default_file => 'default.mdwn'
         , default_pageext => 'mdwn'
         , destdir => $destdir
-        , diffurl => "/gitweb/?p=cyclowiki.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]"
+        , diffurl => "/gitweb/?p=$git_repo.git;a=blobdiff;f=[[file]];h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_commit]];hpb=[[sha1_parent]]"
         #, directive_description_dir => 'ikiwiki/directive'
         , disable_plugins => [qw{
                 headinganchors
                 htmlbalance
                 htmlscrubber
+                htmltidy
                 httpauth
                 lockedit
                 more
                 openid
+                parentlinks
                 po
                 prettydate
                 shortcut
-                toggle
                 }]
-        , discussion => 1
+        , discussion => 0
         , discussionpage => 'Discussion'
         , edit =>
                 { cancel   => 'Annuler'
@@ -213,7 +266,7 @@ BEGIN {
                 , title    => 'édition'
                 , type     => 'Type'
                 }
-        , exclude => qr{^(\.git|\.ikiwiki|Public/\.ikiwiki(|/.*)|Public/recentchanges(|/.*)|Public-www(|/.*))$}
+        , exclude => qr{^(\.git|\.ikiwiki|static|Public/\.ikiwiki(|/.*)|Public/recentchanges(|/.*)|Public-www(|/.*))$}
         , external_links => qr{^(git)(/.*|$)}
         , getsource_mimetype => 'text/plain; charset=utf-8'
         , gitmaster_branch => "master"
@@ -222,10 +275,12 @@ BEGIN {
         , global_sidebars =>
                 [ "TOC", "toc", "/None"
                 , "IMAGE", "image", "/None"
+                , "STATS", "stats", "/None"
+                , "AGENDA", "agenda", "/None"
                 , @$global_sidebars
                 ]
         , hardlink => 0
-        , historyurl => "/gitweb/?p=cyclowiki.git;a=history;f=[[file]]"
+        , historyurl => "/gitweb/?p=$git_repo.git;a=history;f=[[file]]"
         , html5 => 1
         , htmlext => 'html'
         , htmlscrubber_skip => '!*/Discussion',
@@ -241,6 +296,7 @@ BEGIN {
         , newevent_base => 'Agenda'
         , numbacklinks => 1000
         , omega_cgi => '/usr/lib/cgi-bin/omega/omega'
+        , only_committed_changes => $only_committed_changes
         #, openid_cgiurl => ''
         #, openid_realm => ''
         #, openidsignup => 'http://myopenid.com/'
@@ -263,8 +319,8 @@ BEGIN {
         , recentchangesnum => 100
         , recentchangespage => 'recentchanges'
         , repositories =>
-                [ "git://git.cyclocoop.org/cyclowiki"
-                , "git\@git.cyclocoop.org:cyclowiki" ]
+                [ "git://git.cyclocoop.org/$git_repo"
+                , "git\@git.cyclocoop.org:$git_repo" ]
         , rss => 0
         #, rsync_command => 'rsync -qa --delete . user@host:/path/to/docroot/'
         , search_db => $search_db
@@ -308,8 +364,8 @@ BEGIN {
         #, websetup_show_unsafe => 1
         #, websetup_unsafe => []
         , week_start_day => 1
-        , wiki_file_chars => "-[:alnum:]+/.:_'’,()«»"
-        , wiki_file_regexp => qr/(^[-[:alnum:]+\/.:_'’,()«»]+$)/
+        , wiki_file_chars => "-[:alnum:]+/.:_—'’,«»\@°!"
+        , wiki_file_regexp => qr/(^[-[:alnum:]+\/.:_—'’,«»\@°!]+$)/
         #, wiki_file_chars => '-[:alnum:]+/.:_@’()&'
         #, wrappergroup => 'ikiwiki'
         , wikiname => $wikiname