supprimé
[cyclowiki.git] / ikiwiki.setup
index 6c40c34..e6ef777 100644 (file)
@@ -6,7 +6,8 @@ BEGIN {
        use File::Spec::Functions;
        my $srcdir = dirname($IkiWiki::config{'setupfile'});
        my ($wiki, $wikiname, $git_repo, $destdir
-        , $global_sidebars, $search_db, $userdir);
+        , $global_sidebars, $search_db, $userdir,
+        , $only_committed_changes);
        if (-x "$srcdir/Public") {
                $wiki = '3615';
                $wikiname = '3615';
@@ -26,7 +27,7 @@ BEGIN {
                                and !Public/templates
                                and !Public/templates/*'
                 ];
-               $userdir = '/Public/Camarade';
+               $userdir = '/Camarade';
         }
        else {
                $wiki = 'wiki';
@@ -60,6 +61,7 @@ BEGIN {
                $umask     = 002;
                $url       = '/';
                $urls      = "https://$wiki.cyclocoop.org/";
+               $only_committed_changes = 1;
                @wrappers  =
                 ( { cgi => 1
                         , wrapper => $destdir."/cgi/ikiwiki.cgi"
@@ -81,6 +83,7 @@ BEGIN {
                $umask     = 002;
                $url       = '/';
                $urls      = '/';
+               $only_committed_changes = 0;
                @wrappers  =
                 ( { cgi => 1
                         , wrapper => $destdir."/cgi/ikiwiki.cgi"
@@ -94,6 +97,7 @@ BEGIN {
        %setup_args =
         ( ENV => {}
         , account_creation_password => $account_creation_password
+        , default_plugins => []
         , add_plugins => [qw{
                 404
                 action
@@ -101,8 +105,11 @@ BEGIN {
                 attachment
                 brokenlinks
                 comments
+                conditional
+                createpage
                 cutpaste
                 editdiff
+                editpage
                 events
                 favicon
                 img
@@ -110,10 +117,14 @@ BEGIN {
                 link
                 linkmap
                 map
+                mdwn
+                meta
                 moderatedcomments
                 orphans
                 pagecount
                 pagestats
+                pagetemplate
+                parentlinks_fixed
                 passwordauth
                 poll
                 progress
@@ -125,11 +136,13 @@ BEGIN {
                 search
                 sidebar2
                 signinedit
+                signinedit
                 table
                 tag
                 template
                 theme
                 toc
+                toggle
                 trail
                 userlist
                 }]
@@ -139,20 +152,24 @@ BEGIN {
                        Aline
                        Amélie
                        Andréas
-                       Anne-Lise
+                       anne-lise
                        Arnaud
                        Carmel
                        Cecile
                        Corentin
                        David
+                       Galileo
                        Giampiero
+                       giampiero
                        Giulia
                        Giuso
                        Greg
                        Java
                        Julien
                        julm
+                       Louan
                        Marie
+                       marie
                        Martin
                        Mathilde
                        Nico13
@@ -161,13 +178,18 @@ BEGIN {
                        Romain
                        Severine
                        Séverine
+                       simoarrivo
                        Shems
                        Stef
                        Stéphane
+                       stéphane
                        Tania
+                       tania
                        Thai
+                       Thomas
                        Thong
                        Tilman
+                       tilman
                        Una
                        Valérie
                 }]
@@ -221,16 +243,17 @@ BEGIN {
                 headinganchors
                 htmlbalance
                 htmlscrubber
+                htmltidy
                 httpauth
                 lockedit
                 more
                 openid
+                parentlinks
                 po
                 prettydate
                 shortcut
-                toggle
                 }]
-        , discussion => 1
+        , discussion => 0
         , discussionpage => 'Discussion'
         , edit =>
                 { cancel   => 'Annuler'
@@ -243,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"
@@ -273,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/'
@@ -340,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