From 170a5dc333db7741d381a5d4da5ba5364b80f8b2 Mon Sep 17 00:00:00 2001 From: IkiWiki Date: Tue, 17 Sep 2024 14:41:08 -0400 Subject: [PATCH] content/*: move to root --- .gitignore | 2 +- content/Anemones.jpg => Anemones.jpg | Bin ...otstrap_features.mdwn => Bootstrap_features.mdwn | 0 content/Calendars.mdwn => Calendars.mdwn | 0 content/Comments.mdwn => Comments.mdwn | 0 {content/Comments => Comments}/comment_1._comment | 0 {content/Comments => Comments}/comment_2._comment | 0 content/Inline_pages.mdwn => Inline_pages.mdwn | 0 content/Lemonshark.jpg => Lemonshark.jpg | Bin content/Sea_Star.jpg => Sea_Star.jpg | Bin ...chrome-192x192.png => android-chrome-192x192.png | Bin .../apple-touch-icon.png => apple-touch-icon.png | Bin content/browserconfig.xml => browserconfig.xml | 0 content/contact.fr.mo => contact.fr.mo | Bin content/contact.fr.po => contact.fr.po | 0 content/contact.mdwn => contact.mdwn | 0 content/contact.pot => contact.pot | 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 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 ++-- .../images => images}/avatar-rounded-200x200.png | Bin {content/images => images}/languages.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/inlinetest.mdwn => inlinetest.mdwn | 0 {content/js => js}/mastodon.js | 0 ...net-72498db60f2a3d5786517585eba2a86db6fcb3ab.asc | 0 {content/meta => meta}/license.mdwn | 0 content/mstile-150x150.png => mstile-150x150.png | Bin .../sample_text => sample_text}/Donec_dapibus.mdwn | 0 .../sample_text => sample_text}/Donec_semper.mdwn | 0 .../sample_text => sample_text}/Lorem_ipsum.mdwn | 0 .../sample_text => sample_text}/Nulla_facilisi.mdwn | 0 {content/sample_text => sample_text}/Sed_eget.mdwn | 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 {content/tag => tag}/Cicero/index.mdwn | 0 {content/tag => tag}/Latin/index.mdwn | 0 {content/tag => tag}/typesetting/index.mdwn | 0 58 files changed, 3 insertions(+), 3 deletions(-) rename content/Anemones.jpg => Anemones.jpg (100%) rename content/Bootstrap_features.mdwn => Bootstrap_features.mdwn (100%) rename content/Calendars.mdwn => Calendars.mdwn (100%) rename content/Comments.mdwn => Comments.mdwn (100%) rename {content/Comments => Comments}/comment_1._comment (100%) rename {content/Comments => Comments}/comment_2._comment (100%) rename content/Inline_pages.mdwn => Inline_pages.mdwn (100%) rename content/Lemonshark.jpg => Lemonshark.jpg (100%) rename content/Sea_Star.jpg => Sea_Star.jpg (100%) rename content/android-chrome-192x192.png => android-chrome-192x192.png (100%) rename content/apple-touch-icon.png => apple-touch-icon.png (100%) rename content/browserconfig.xml => browserconfig.xml (100%) rename content/contact.fr.mo => contact.fr.mo (100%) rename content/contact.fr.po => contact.fr.po (100%) rename content/contact.mdwn => contact.mdwn (100%) rename content/contact.pot => contact.pot (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-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}/avatar-rounded-200x200.png (100%) rename {content/images => images}/languages.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/inlinetest.mdwn => inlinetest.mdwn (100%) rename {content/js => js}/mastodon.js (100%) rename {content/keys => keys}/publickey.antoine.at.ayakael.net-72498db60f2a3d5786517585eba2a86db6fcb3ab.asc (100%) rename {content/meta => meta}/license.mdwn (100%) rename content/mstile-150x150.png => mstile-150x150.png (100%) rename {content/sample_text => sample_text}/Donec_dapibus.mdwn (100%) rename {content/sample_text => sample_text}/Donec_semper.mdwn (100%) rename {content/sample_text => sample_text}/Lorem_ipsum.mdwn (100%) rename {content/sample_text => sample_text}/Nulla_facilisi.mdwn (100%) rename {content/sample_text => sample_text}/Sed_eget.mdwn (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%) rename {content/tag => tag}/Cicero/index.mdwn (100%) rename {content/tag => tag}/Latin/index.mdwn (100%) rename {content/tag => tag}/typesetting/index.mdwn (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/Anemones.jpg b/Anemones.jpg similarity index 100% rename from content/Anemones.jpg rename to Anemones.jpg diff --git a/content/Bootstrap_features.mdwn b/Bootstrap_features.mdwn similarity index 100% rename from content/Bootstrap_features.mdwn rename to Bootstrap_features.mdwn diff --git a/content/Calendars.mdwn b/Calendars.mdwn similarity index 100% rename from content/Calendars.mdwn rename to Calendars.mdwn diff --git a/content/Comments.mdwn b/Comments.mdwn similarity index 100% rename from content/Comments.mdwn rename to Comments.mdwn diff --git a/content/Comments/comment_1._comment b/Comments/comment_1._comment similarity index 100% rename from content/Comments/comment_1._comment rename to Comments/comment_1._comment diff --git a/content/Comments/comment_2._comment b/Comments/comment_2._comment similarity index 100% rename from content/Comments/comment_2._comment rename to Comments/comment_2._comment diff --git a/content/Inline_pages.mdwn b/Inline_pages.mdwn similarity index 100% rename from content/Inline_pages.mdwn rename to Inline_pages.mdwn diff --git a/content/Lemonshark.jpg b/Lemonshark.jpg similarity index 100% rename from content/Lemonshark.jpg rename to Lemonshark.jpg diff --git a/content/Sea_Star.jpg b/Sea_Star.jpg similarity index 100% rename from content/Sea_Star.jpg rename to Sea_Star.jpg 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/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/contact.fr.mo b/contact.fr.mo similarity index 100% rename from content/contact.fr.mo rename to contact.fr.mo diff --git a/content/contact.fr.po b/contact.fr.po similarity index 100% rename from content/contact.fr.po rename to contact.fr.po diff --git a/content/contact.mdwn b/contact.mdwn similarity index 100% rename from content/contact.mdwn rename to contact.mdwn diff --git a/content/contact.pot b/contact.pot similarity index 100% rename from content/contact.pot rename to contact.pot 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-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 3c1e153..7e77abc 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 @@ -103,7 +103,7 @@ timezone: :/etc/localtime # regexp of normally excluded files to include include: ^(\.htaccess|.*/keys/.*.asc)$ # regexp of files that should be skipped -exclude: ^(tools/.*|lib/.*)$ +exclude: ^(tools/.*|lib/.*|public/.*)$ # 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/avatar-rounded-200x200.png b/images/avatar-rounded-200x200.png similarity index 100% rename from content/images/avatar-rounded-200x200.png rename to images/avatar-rounded-200x200.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/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/inlinetest.mdwn b/inlinetest.mdwn similarity index 100% rename from content/inlinetest.mdwn rename to inlinetest.mdwn diff --git a/content/js/mastodon.js b/js/mastodon.js similarity index 100% rename from content/js/mastodon.js rename to js/mastodon.js diff --git a/content/keys/publickey.antoine.at.ayakael.net-72498db60f2a3d5786517585eba2a86db6fcb3ab.asc b/keys/publickey.antoine.at.ayakael.net-72498db60f2a3d5786517585eba2a86db6fcb3ab.asc similarity index 100% rename from content/keys/publickey.antoine.at.ayakael.net-72498db60f2a3d5786517585eba2a86db6fcb3ab.asc rename to keys/publickey.antoine.at.ayakael.net-72498db60f2a3d5786517585eba2a86db6fcb3ab.asc 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/sample_text/Donec_dapibus.mdwn b/sample_text/Donec_dapibus.mdwn similarity index 100% rename from content/sample_text/Donec_dapibus.mdwn rename to sample_text/Donec_dapibus.mdwn diff --git a/content/sample_text/Donec_semper.mdwn b/sample_text/Donec_semper.mdwn similarity index 100% rename from content/sample_text/Donec_semper.mdwn rename to sample_text/Donec_semper.mdwn diff --git a/content/sample_text/Lorem_ipsum.mdwn b/sample_text/Lorem_ipsum.mdwn similarity index 100% rename from content/sample_text/Lorem_ipsum.mdwn rename to sample_text/Lorem_ipsum.mdwn diff --git a/content/sample_text/Nulla_facilisi.mdwn b/sample_text/Nulla_facilisi.mdwn similarity index 100% rename from content/sample_text/Nulla_facilisi.mdwn rename to sample_text/Nulla_facilisi.mdwn diff --git a/content/sample_text/Sed_eget.mdwn b/sample_text/Sed_eget.mdwn similarity index 100% rename from content/sample_text/Sed_eget.mdwn rename to sample_text/Sed_eget.mdwn 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 diff --git a/content/tag/Cicero/index.mdwn b/tag/Cicero/index.mdwn similarity index 100% rename from content/tag/Cicero/index.mdwn rename to tag/Cicero/index.mdwn diff --git a/content/tag/Latin/index.mdwn b/tag/Latin/index.mdwn similarity index 100% rename from content/tag/Latin/index.mdwn rename to tag/Latin/index.mdwn diff --git a/content/tag/typesetting/index.mdwn b/tag/typesetting/index.mdwn similarity index 100% rename from content/tag/typesetting/index.mdwn rename to tag/typesetting/index.mdwn