Correction : submodules, sparkleshare, setup.
authorJulien Moutinho <julm@cyclocoop.org>
Tue, 22 Apr 2014 21:41:44 +0000 (23:41 +0200)
committerJulien Moutinho <julm@cyclocoop.org>
Tue, 22 Apr 2014 21:41:55 +0000 (23:41 +0200)
.gitmodules [new file with mode: 0644]
.sparkleshare [new file with mode: 0644]
ikiwiki.setup

diff --git a/.gitmodules b/.gitmodules
new file mode 100644 (file)
index 0000000..a2b88f5
--- /dev/null
@@ -0,0 +1,18 @@
+[submodule ".ikiwiki/lib/IkiWiki/Plugin/poll"]
+       path = .ikiwiki/lib/IkiWiki/Plugin/poll
+       url = ../ikiwiki/poll
+[submodule ".ikiwiki/lib/IkiWiki/Plugin/sidebar2"]
+       path = .ikiwiki/lib/IkiWiki/Plugin/sidebar2
+       url = ../ikiwiki/sidebar2
+[submodule ".ikiwiki/lib/IkiWiki/Plugin/toc"]
+       path = .ikiwiki/lib/IkiWiki/Plugin/toc
+       url = ../ikiwiki/toc
+[submodule ".ikiwiki/lib/IkiWiki/Plugin/action"]
+       path = .ikiwiki/lib/IkiWiki/Plugin/action
+       url = ../ikiwiki/action
+[submodule ".ikiwiki/lib/IkiWiki/Plugin/search"]
+       path = .ikiwiki/lib/IkiWiki/Plugin/search
+       url = ../ikiwiki/search
+[submodule ".ikiwiki/lib/IkiWiki/Plugin/events"]
+       path = .ikiwiki/lib/IkiWiki/Plugin/events
+       url = ../ikiwiki/events
diff --git a/.sparkleshare b/.sparkleshare
new file mode 100644 (file)
index 0000000..6ce334c
--- /dev/null
@@ -0,0 +1 @@
+23c5b43c11c34ef06b0f4c9d691f109054221b87
\ No newline at end of file
index e33e56b..dc02b73 100644 (file)
@@ -10,7 +10,9 @@ BEGIN {
                $wiki = '3615';
                $wikiname = '3615';
                $destdir = $srcdir.'-www';
-               $global_sidebars = [];
+               $global_sidebars =
+                [ "PREVISION_DU_BENEVOLAT", "/Public/Savoir-faire/Autogestion/Bénévolat/Prévision", "index"
+                ];
                $search_db = # db, auth required, page having the search, pages indexed
                 [ '3615', 1
                 , '*'
@@ -29,7 +31,7 @@ BEGIN {
                $wikiname = 'CycloWiki';
                $destdir = $srcdir.'-www';
                $global_sidebars =
-                [ 
+                [ "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
@@ -42,12 +44,14 @@ BEGIN {
                $userdir = '/Camarade';
         }
        my $sharedir = $ENV{IKIWIKI_SHARE} ? $ENV{IKIWIKI_SHARE} : '/usr/share/ikiwiki';
-       print "srcdir=$srcdir\n";
        my ($account_creation_password);
        my ($sslcookie, $umask, $url, $urls, @wrappers);
        if (-x "/home/www/data/cyclo-$wiki") {
                $destdir   = "/home/www/data/cyclo-$wiki";
-               $srcdir    = "/home/cyclo/var/ikiwiki/cyclo-$wiki/src";
+               $srcdir = ((-x "$srcdir/Public")
+                ? "/home/cyclo/var/ikiwiki/cyclo-$wiki/src"
+                : "/home/cyclo/var/ikiwiki/cyclo-3615/src/Public"
+                );
                $sslcookie = 1;
                $umask     = 002;
                $url       = '/';
@@ -82,6 +86,7 @@ BEGIN {
                 );
                $account_creation_password = '';
         }
+       print "srcdir=$srcdir\n";
        print "destdir=$destdir\n";
        %setup_args =
         ( ENV => {}
@@ -217,7 +222,6 @@ BEGIN {
         , global_sidebars =>
                 [ "TOC", "toc", "/None"
                 , "IMAGE", "image", "/None"
-                , "PREVISION_DU_BENEVOLAT", "/Public/Savoir-faire/Autogestion/Bénévolat/Prévision", "index"
                 , @$global_sidebars
                 ]
         , hardlink => 0