From 4ada3978859a7fd5f60d694d044ff76d7b67812c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 17 Sep 2024 15:02:04 -0400 Subject: [PATCH] content/*: move to root --- .gitignore | 2 +- ...chrome-192x192.png => android-chrome-192x192.png | Bin ...chrome-512x512.png => android-chrome-512x512.png | Bin .../apple-touch-icon.png => apple-touch-icon.png | Bin content/browserconfig.xml => browserconfig.xml | 0 {content/css => css}/bootstrap.local.css | 0 {content/css => css}/local.css | 0 {content/css => css}/style.css | 0 content/favicon-16x16.png => favicon-16x16.png | Bin ...vicon-24x24-white.png => favicon-24x24-white.png | Bin content/favicon-24x24.png => favicon-24x24.png | Bin content/favicon-32x32.png => favicon-32x32.png | Bin content/favicon.ico => favicon.ico | Bin content/favicon.png => favicon.png | Bin .../glyphicons-halflings-regular.eot | Bin .../glyphicons-halflings-regular.svg | 0 .../glyphicons-halflings-regular.ttf | Bin .../glyphicons-halflings-regular.woff | Bin .../glyphicons-halflings-regular.woff2 | Bin content/footer.fr.mo => footer.fr.mo | Bin content/footer.fr.po => footer.fr.po | 0 content/footer.html => footer.html | 0 content/footer.pot => footer.pot | 0 ikiwiki.setup | 4 ++-- {content/images => images}/banner_black_542x152.png | Bin {content/images => images}/banner_white_86x24.png | Bin {content/images => images}/header_black.png | Bin .../images => images}/header_black_1368x944.png | Bin {content/images => images}/header_white.png | Bin {content/images => images}/ilot_black_128x128.png | Bin {content/images => images}/ilot_black_1920x1920.png | Bin {content/images => images}/ilot_black_256x256.png | Bin {content/images => images}/ilot_black_512x512.png | Bin {content/images => images}/languages.png | Bin .../images => images}/logo-name_black_128x128.png | Bin .../images => images}/logo-name_black_1921-1920.png | Bin .../images => images}/logo-name_black_256x256.png | Bin .../images => images}/logo-name_black_512x512.png | Bin content/index.fr.mo => index.fr.mo | Bin content/index.fr.po => index.fr.po | 0 content/index.mdwn => index.mdwn | 0 content/index.pot => index.pot | 0 content/join.fr.mo => join.fr.mo | Bin content/join.fr.po => join.fr.po | 0 content/join.html => join.html | 0 content/join.pot => join.pot | 0 {content/js => js}/join.js | 0 {content/meta => meta}/code-of-conduct.mdwn | 0 {content/meta => meta}/license.mdwn | 0 content/mstile-150x150.png => mstile-150x150.png | Bin content/platforms.fr.mo => platforms.fr.mo | Bin content/platforms.fr.po => platforms.fr.po | 0 content/platforms.mdwn => platforms.mdwn | 0 content/platforms.pot => platforms.pot | 0 .../safari-pinned-tab.svg => safari-pinned-tab.svg | 0 content/sidebar.fr.mo => sidebar.fr.mo | Bin content/sidebar.fr.po => sidebar.fr.po | 0 content/sidebar.html => sidebar.html | 0 content/sidebar.pot => sidebar.pot | 0 content/site.webmanifest => site.webmanifest | 0 60 files changed, 3 insertions(+), 3 deletions(-) rename content/android-chrome-192x192.png => android-chrome-192x192.png (100%) rename content/android-chrome-512x512.png => android-chrome-512x512.png (100%) rename content/apple-touch-icon.png => apple-touch-icon.png (100%) rename content/browserconfig.xml => browserconfig.xml (100%) rename {content/css => css}/bootstrap.local.css (100%) rename {content/css => css}/local.css (100%) rename {content/css => css}/style.css (100%) rename content/favicon-16x16.png => favicon-16x16.png (100%) rename content/favicon-24x24-white.png => favicon-24x24-white.png (100%) rename content/favicon-24x24.png => favicon-24x24.png (100%) rename content/favicon-32x32.png => favicon-32x32.png (100%) rename content/favicon.ico => favicon.ico (100%) rename content/favicon.png => favicon.png (100%) rename {content/fonts => fonts}/glyphicons-halflings-regular.eot (100%) rename {content/fonts => fonts}/glyphicons-halflings-regular.svg (100%) rename {content/fonts => fonts}/glyphicons-halflings-regular.ttf (100%) rename {content/fonts => fonts}/glyphicons-halflings-regular.woff (100%) rename {content/fonts => fonts}/glyphicons-halflings-regular.woff2 (100%) rename content/footer.fr.mo => footer.fr.mo (100%) rename content/footer.fr.po => footer.fr.po (100%) rename content/footer.html => footer.html (100%) rename content/footer.pot => footer.pot (100%) rename {content/images => images}/banner_black_542x152.png (100%) rename {content/images => images}/banner_white_86x24.png (100%) rename {content/images => images}/header_black.png (100%) rename {content/images => images}/header_black_1368x944.png (100%) rename {content/images => images}/header_white.png (100%) rename {content/images => images}/ilot_black_128x128.png (100%) rename {content/images => images}/ilot_black_1920x1920.png (100%) rename {content/images => images}/ilot_black_256x256.png (100%) rename {content/images => images}/ilot_black_512x512.png (100%) rename {content/images => images}/languages.png (100%) rename {content/images => images}/logo-name_black_128x128.png (100%) rename {content/images => images}/logo-name_black_1921-1920.png (100%) rename {content/images => images}/logo-name_black_256x256.png (100%) rename {content/images => images}/logo-name_black_512x512.png (100%) rename content/index.fr.mo => index.fr.mo (100%) rename content/index.fr.po => index.fr.po (100%) rename content/index.mdwn => index.mdwn (100%) rename content/index.pot => index.pot (100%) rename content/join.fr.mo => join.fr.mo (100%) rename content/join.fr.po => join.fr.po (100%) rename content/join.html => join.html (100%) rename content/join.pot => join.pot (100%) rename {content/js => js}/join.js (100%) rename {content/meta => meta}/code-of-conduct.mdwn (100%) rename {content/meta => meta}/license.mdwn (100%) rename content/mstile-150x150.png => mstile-150x150.png (100%) rename content/platforms.fr.mo => platforms.fr.mo (100%) rename content/platforms.fr.po => platforms.fr.po (100%) rename content/platforms.mdwn => platforms.mdwn (100%) rename content/platforms.pot => platforms.pot (100%) rename content/safari-pinned-tab.svg => safari-pinned-tab.svg (100%) rename content/sidebar.fr.mo => sidebar.fr.mo (100%) rename content/sidebar.fr.po => sidebar.fr.po (100%) rename content/sidebar.html => sidebar.html (100%) rename content/sidebar.pot => sidebar.pot (100%) rename content/site.webmanifest => site.webmanifest (100%) diff --git a/.gitignore b/.gitignore index dd950df..13f4f82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -content/.ikiwiki +.ikiwiki public/ tools/http-server/ diff --git a/content/android-chrome-192x192.png b/android-chrome-192x192.png similarity index 100% rename from content/android-chrome-192x192.png rename to android-chrome-192x192.png diff --git a/content/android-chrome-512x512.png b/android-chrome-512x512.png similarity index 100% rename from content/android-chrome-512x512.png rename to android-chrome-512x512.png diff --git a/content/apple-touch-icon.png b/apple-touch-icon.png similarity index 100% rename from content/apple-touch-icon.png rename to apple-touch-icon.png diff --git a/content/browserconfig.xml b/browserconfig.xml similarity index 100% rename from content/browserconfig.xml rename to browserconfig.xml diff --git a/content/css/bootstrap.local.css b/css/bootstrap.local.css similarity index 100% rename from content/css/bootstrap.local.css rename to css/bootstrap.local.css diff --git a/content/css/local.css b/css/local.css similarity index 100% rename from content/css/local.css rename to css/local.css diff --git a/content/css/style.css b/css/style.css similarity index 100% rename from content/css/style.css rename to css/style.css diff --git a/content/favicon-16x16.png b/favicon-16x16.png similarity index 100% rename from content/favicon-16x16.png rename to favicon-16x16.png diff --git a/content/favicon-24x24-white.png b/favicon-24x24-white.png similarity index 100% rename from content/favicon-24x24-white.png rename to favicon-24x24-white.png diff --git a/content/favicon-24x24.png b/favicon-24x24.png similarity index 100% rename from content/favicon-24x24.png rename to favicon-24x24.png diff --git a/content/favicon-32x32.png b/favicon-32x32.png similarity index 100% rename from content/favicon-32x32.png rename to favicon-32x32.png diff --git a/content/favicon.ico b/favicon.ico similarity index 100% rename from content/favicon.ico rename to favicon.ico diff --git a/content/favicon.png b/favicon.png similarity index 100% rename from content/favicon.png rename to favicon.png diff --git a/content/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from content/fonts/glyphicons-halflings-regular.eot rename to fonts/glyphicons-halflings-regular.eot diff --git a/content/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from content/fonts/glyphicons-halflings-regular.svg rename to fonts/glyphicons-halflings-regular.svg diff --git a/content/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from content/fonts/glyphicons-halflings-regular.ttf rename to fonts/glyphicons-halflings-regular.ttf diff --git a/content/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from content/fonts/glyphicons-halflings-regular.woff rename to fonts/glyphicons-halflings-regular.woff diff --git a/content/fonts/glyphicons-halflings-regular.woff2 b/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from content/fonts/glyphicons-halflings-regular.woff2 rename to fonts/glyphicons-halflings-regular.woff2 diff --git a/content/footer.fr.mo b/footer.fr.mo similarity index 100% rename from content/footer.fr.mo rename to footer.fr.mo diff --git a/content/footer.fr.po b/footer.fr.po similarity index 100% rename from content/footer.fr.po rename to footer.fr.po diff --git a/content/footer.html b/footer.html similarity index 100% rename from content/footer.html rename to footer.html diff --git a/content/footer.pot b/footer.pot similarity index 100% rename from content/footer.pot rename to footer.pot diff --git a/ikiwiki.setup b/ikiwiki.setup index e717d51..75d756a 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -16,7 +16,7 @@ adminuser: [] # users who are banned from the wiki banned_users: [] # where the source of the wiki is located -srcdir: ./content +srcdir: ./ # where to build the wiki destdir: ./public # base url to the wiki @@ -101,7 +101,7 @@ timezone: :/etc/localtime # regexp of normally excluded files to include #include: ^\.htaccess$ # regexp of files that should be skipped -exclude: ^(tools/.*|)$ +exclude: ^(tools/.*|public/.*|plugins/.*)$ # specifies the characters that are allowed in source filenames wiki_file_chars: -[:alnum:]+/.:_ # allow symlinks in the path leading to the srcdir (potentially insecure) diff --git a/content/images/banner_black_542x152.png b/images/banner_black_542x152.png similarity index 100% rename from content/images/banner_black_542x152.png rename to images/banner_black_542x152.png diff --git a/content/images/banner_white_86x24.png b/images/banner_white_86x24.png similarity index 100% rename from content/images/banner_white_86x24.png rename to images/banner_white_86x24.png diff --git a/content/images/header_black.png b/images/header_black.png similarity index 100% rename from content/images/header_black.png rename to images/header_black.png diff --git a/content/images/header_black_1368x944.png b/images/header_black_1368x944.png similarity index 100% rename from content/images/header_black_1368x944.png rename to images/header_black_1368x944.png diff --git a/content/images/header_white.png b/images/header_white.png similarity index 100% rename from content/images/header_white.png rename to images/header_white.png diff --git a/content/images/ilot_black_128x128.png b/images/ilot_black_128x128.png similarity index 100% rename from content/images/ilot_black_128x128.png rename to images/ilot_black_128x128.png diff --git a/content/images/ilot_black_1920x1920.png b/images/ilot_black_1920x1920.png similarity index 100% rename from content/images/ilot_black_1920x1920.png rename to images/ilot_black_1920x1920.png diff --git a/content/images/ilot_black_256x256.png b/images/ilot_black_256x256.png similarity index 100% rename from content/images/ilot_black_256x256.png rename to images/ilot_black_256x256.png diff --git a/content/images/ilot_black_512x512.png b/images/ilot_black_512x512.png similarity index 100% rename from content/images/ilot_black_512x512.png rename to images/ilot_black_512x512.png diff --git a/content/images/languages.png b/images/languages.png similarity index 100% rename from content/images/languages.png rename to images/languages.png diff --git a/content/images/logo-name_black_128x128.png b/images/logo-name_black_128x128.png similarity index 100% rename from content/images/logo-name_black_128x128.png rename to images/logo-name_black_128x128.png diff --git a/content/images/logo-name_black_1921-1920.png b/images/logo-name_black_1921-1920.png similarity index 100% rename from content/images/logo-name_black_1921-1920.png rename to images/logo-name_black_1921-1920.png diff --git a/content/images/logo-name_black_256x256.png b/images/logo-name_black_256x256.png similarity index 100% rename from content/images/logo-name_black_256x256.png rename to images/logo-name_black_256x256.png diff --git a/content/images/logo-name_black_512x512.png b/images/logo-name_black_512x512.png similarity index 100% rename from content/images/logo-name_black_512x512.png rename to images/logo-name_black_512x512.png diff --git a/content/index.fr.mo b/index.fr.mo similarity index 100% rename from content/index.fr.mo rename to index.fr.mo diff --git a/content/index.fr.po b/index.fr.po similarity index 100% rename from content/index.fr.po rename to index.fr.po diff --git a/content/index.mdwn b/index.mdwn similarity index 100% rename from content/index.mdwn rename to index.mdwn diff --git a/content/index.pot b/index.pot similarity index 100% rename from content/index.pot rename to index.pot diff --git a/content/join.fr.mo b/join.fr.mo similarity index 100% rename from content/join.fr.mo rename to join.fr.mo diff --git a/content/join.fr.po b/join.fr.po similarity index 100% rename from content/join.fr.po rename to join.fr.po diff --git a/content/join.html b/join.html similarity index 100% rename from content/join.html rename to join.html diff --git a/content/join.pot b/join.pot similarity index 100% rename from content/join.pot rename to join.pot diff --git a/content/js/join.js b/js/join.js similarity index 100% rename from content/js/join.js rename to js/join.js diff --git a/content/meta/code-of-conduct.mdwn b/meta/code-of-conduct.mdwn similarity index 100% rename from content/meta/code-of-conduct.mdwn rename to meta/code-of-conduct.mdwn diff --git a/content/meta/license.mdwn b/meta/license.mdwn similarity index 100% rename from content/meta/license.mdwn rename to meta/license.mdwn diff --git a/content/mstile-150x150.png b/mstile-150x150.png similarity index 100% rename from content/mstile-150x150.png rename to mstile-150x150.png diff --git a/content/platforms.fr.mo b/platforms.fr.mo similarity index 100% rename from content/platforms.fr.mo rename to platforms.fr.mo diff --git a/content/platforms.fr.po b/platforms.fr.po similarity index 100% rename from content/platforms.fr.po rename to platforms.fr.po diff --git a/content/platforms.mdwn b/platforms.mdwn similarity index 100% rename from content/platforms.mdwn rename to platforms.mdwn diff --git a/content/platforms.pot b/platforms.pot similarity index 100% rename from content/platforms.pot rename to platforms.pot diff --git a/content/safari-pinned-tab.svg b/safari-pinned-tab.svg similarity index 100% rename from content/safari-pinned-tab.svg rename to safari-pinned-tab.svg diff --git a/content/sidebar.fr.mo b/sidebar.fr.mo similarity index 100% rename from content/sidebar.fr.mo rename to sidebar.fr.mo diff --git a/content/sidebar.fr.po b/sidebar.fr.po similarity index 100% rename from content/sidebar.fr.po rename to sidebar.fr.po diff --git a/content/sidebar.html b/sidebar.html similarity index 100% rename from content/sidebar.html rename to sidebar.html diff --git a/content/sidebar.pot b/sidebar.pot similarity index 100% rename from content/sidebar.pot rename to sidebar.pot diff --git a/content/site.webmanifest b/site.webmanifest similarity index 100% rename from content/site.webmanifest rename to site.webmanifest