[Org] Repository for my personal website.

More granularity in wiki components.

Commit
503b28c4b43c4256680399add97cd9bf6cbd28d3
Author
Marius Peter <marius.peter@tutanota.com>
Author date
Committer
Marius Peter <marius.peter@tutanota.com>
Committer date
publish-mlnp.org
index 0ee64634..c8f299ca 100644..100644
@@ -107,13 +107,12 @@
107 107 is used to publish the website on the internet, it then becomes
108 108 visible at [[http://mlnp.fr/][mlnp.fr]].
109 109
110 Removed: We follow the recommendation outlined in the manual's [[https://orgmode.org/manual/Uploading-Files.html][uploading
111 Removed: files]] section: in the case of remote publishing, we first publish
112 Removed: locally, then ~rsync~ the local copy with the remote one. This is
113 Removed: much more efficient for small updates---when attempting to publish
114 Removed: to the remote target directly, =tramp= will `dumbly' check files for
115 Removed: changes one by one, instead of checking the overall delta, which
116 Removed: ~rsync~ does.
110 Added: We follow the recommendation outlined in the manual's [[https://orgmode.org/manual/Uploading-Files.html][uploading files]]
111 Added: section: in the case of remote publishing, we first publish locally,
112 Added: then ~rsync~ the local copy with the remote one. This is much more
113 Added: efficient for small updates---when attempting to publish to the remote
114 Added: target directly, =tramp= will `dumbly' check files for changes one by
115 Added: one, instead of checking the overall delta, which ~rsync~ does.
117 116
118 117 #+NAME: org-publish-locations
119 118 #+BEGIN_SRC emacs-lisp
@@ -169,7 +168,7 @@
169 168
170 169 ** JS
171 170
172 Removed: The goal of this website is to /not/ have to rely on JavaScript.
171 Added: A goal of this website is to /not/ have to rely on JavaScript.
173 172
174 173
175 174 * COMMENT HTML preamble
@@ -220,44 +219,7 @@
220 219 "blog.mlnp.fr"))))
221 220 #+END_SRC
222 221
223 Removed: #+RESULTS: org-publish-project-alist
224 Removed: #+begin_example
225 Removed: (("mlnp.fr" :components
226 Removed: ("mlnp-main-pages" "mlnp-cv-txt" "mlnp-resources" "resources-pages" "mlnp-fonts"))
227 Removed: ("mlnp-main-pages" :base-directory "./" :base-extension "org" :publishing-directory "/tmp/mlnp.fr/" :recursive nil :auto-sitemap t :sitemap-title "Sitemap for [[https://wiki.mlnp.fr][wiki.mlnp.fr]]" :publishing-function org-html-publish-to-html)
228 Removed: ("mlnp-cv-txt" :base-directory "./" :base-extension "txt" :publishing-directory "/tmp/mlnp.fr/" :publishing-function org-publish-attachment)
229 Removed: ("mlnp-resources" :base-directory "resources/" :base-extension "css\\|js\\|png" :publishing-directory "/tmp/mlnp.fr/resources/" :publishing-function org-publish-attachment)
230 Removed: ("resources-pages" :base-directory "resources/" :base-extension "org" :publishing-directory "/tmp/mlnp.fr/resources/" :recursive t :publishing-function org-html-publish-to-html)
231 Removed: ("mlnp-fonts" :base-directory "resources/fonts/" :base-extension "ttf\\|otf" :publishing-directory "/tmp/mlnp.fr/resources/fonts/" :publishing-function org-publish-attachment)
232 Removed: ("wiki.mlnp.fr" :components
233 Removed: ("wiki-main-pages" "wiki-resources" "wiki-fonts" "wiki-images"))
234 Removed: ("wiki-main-pages" :components
235 Removed: ("wiki-sitemap" "wiki---aerospace" "wiki---emacs" "wiki---languages" "wiki---linux" "wiki---programming" "wiki---typography"))
236 Removed: ("wiki-sitemap")
237 Removed: ("wiki---aerospace" :base-directory "wiki/aerospace" :base-extension "org" :publishing-directory "/tmp/wiki.mlnp.fr/aerospace" :recursive t :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>\n <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" :publishing-function org-html-publish-to-html)
238 Removed: ("wiki---emacs" :base-directory "wiki/emacs" :base-extension "org" :publishing-directory "/tmp/wiki.mlnp.fr/emacs" :recursive t :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>\n <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" :publishing-function org-html-publish-to-html)
239 Removed: ("wiki---languages" :base-directory "wiki/languages" :base-extension "org" :publishing-directory "/tmp/wiki.mlnp.fr/languages" :recursive t :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>\n <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" :publishing-function org-html-publish-to-html)
240 Removed: ("wiki---linux" :base-directory "wiki/linux" :base-extension "org" :publishing-directory "/tmp/wiki.mlnp.fr/linux" :recursive t :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>\n <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" :publishing-function org-html-publish-to-html)
241 Removed: ("wiki---programming" :base-directory "wiki/programming" :base-extension "org" :publishing-directory "/tmp/wiki.mlnp.fr/programming" :recursive t :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>\n <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" :publishing-function org-html-publish-to-html)
242 Removed: ("wiki---typography" :base-directory "wiki/typography" :base-extension "org" :publishing-directory "/tmp/wiki.mlnp.fr/typography" :recursive t :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>\n <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-filename "index.org" :publishing-function org-html-publish-to-html)
243 Removed: ("wiki-resources" :base-directory "resources/" :base-extension "css\\|js\\|png" :publishing-directory "/tmp/wiki.mlnp.fr/resources/" :publishing-function org-publish-attachment)
244 Removed: ("wiki-fonts" :base-directory "resources/fonts/" :base-extension "ttf\\|otf" :publishing-directory "/tmp/wiki.mlnp.fr/resources/fonts/" :publishing-function org-publish-attachment)
245 Removed: ("wiki-images" :base-directory "wiki/images/" :base-extension "png\\|jpg" :publishing-directory "/tmp/wiki.mlnp.fr/images/" :publishing-function org-publish-attachment)
246 Removed: ("blog.mlnp.fr" :components
247 Removed: ("blog-main-pages" "blog-resources" "blog-fonts"))
248 Removed: ("blog-main-pages" :base-directory "blog/" :base-extension "org" :publishing-directory "/tmp/blog.mlnp.fr/" :recursive t :html-head "<link rel='stylesheet' type='text/css' href='https://blog.mlnp.fr/resources/mlnp.css'/>\n <link rel='icon' type='image/png' href='https://blog.mlnp.fr/resources/favicon.png'/>" :auto-sitemap t :sitemap-title "Sitemap for [[https://blog.mlnp.fr][blog.mlnp.fr]]" :sitemap-sort-files anti-chronologically :publishing-function org-html-publish-to-html)
249 Removed: ("blog-resources" :base-directory "resources/" :base-extension "css\\|js\\|png" :publishing-directory "/tmp/blog.mlnp.fr/resources/" :publishing-function org-publish-attachment)
250 Removed: ("blog-fonts" :base-directory "resources/fonts/" :base-extension "ttf\\|otf" :publishing-directory "/tmp/blog.mlnp.fr/resources/fonts/" :publishing-function org-publish-attachment)
251 Removed: ("all-styles" :components
252 Removed: ("styles-mlnp" "styles-wiki" "styles-blog"))
253 Removed: ("styles-mlnp" :base-directory "resources/" :base-extension "css" :publishing-directory "/tmp/mlnp.fr/resources/" :publishing-function org-publish-attachment)
254 Removed: ("styles-wiki" :base-directory "resources/" :base-extension "css" :publishing-directory "/tmp/wiki.mlnp.fr/resources/" :publishing-function org-publish-attachment)
255 Removed: ("styles-blog" :base-directory "resources/" :base-extension "css" :publishing-directory "/tmp/blog.mlnp.fr/resources/" :publishing-function org-publish-attachment)
256 Removed: ("everything" :components
257 Removed: ("mlnp.fr" "wiki.mlnp.fr" "blog.mlnp.fr")))
258 Removed: #+end_example
259 222
260 Removed:
261 223 ** All styles
262 224
263 225 We specify a separate publishing component for website styling
@@ -350,20 +312,21 @@
350 312 "wiki-fonts"
351 313 "wiki-images"))
352 314 ("wiki-main-pages"
353 Removed: :components (;; "wiki-sitemap"
315 Added: :components ("wiki-sitemap"
354 316 "wiki-index"
355 Removed: "wiki---aerospace"
317 Added: "wiki---engineering"
356 318 "wiki---emacs"
357 319 "wiki---languages"
320 Added: "wiki---fitness"
358 321 "wiki---linux"
359 322 "wiki---programming"
360 323 "wiki---typography"))
361 Removed: ;; ("wiki-sitemap" ;; TODO
362 Removed: ;; )
363 Removed: <<wiki-index>>
364 Removed: <<wiki---aerospace>>
324 Added: <<wiki-sitemap>>
325 Added: <<wiki-index>>
326 Added: <<wiki---engineering>>
365 327 <<wiki---emacs>>
366 328 <<wiki---languages>>
329 Added: <<wiki---fitness>>
367 330 <<wiki---linux>>
368 331 <<wiki---programming>>
369 332 <<wiki---typography>>
@@ -385,6 +348,23 @@
385 348 #+END_SRC
386 349
387 350
351 Added: *** Sitemap
352 Added:
353 Added: #+NAME: wiki-sitemap
354 Added: #+BEGIN_SRC emacs-lisp
355 Added: ("wiki-sitemap"
356 Added: :base-directory "wiki/"
357 Added: :base-extension "org"
358 Added: :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/")
359 Added: :recursive t ; Encompass all wiki pages.
360 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
361 Added: <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
362 Added: :auto-sitemap t
363 Added: :sitemap-title "Full sitemap for [[https://wiki.mlnp.fr][wiki.mlnp.fr]]"
364 Added: :publishing-function org-html-publish-to-html)
365 Added: #+END_SRC
366 Added:
367 Added:
388 368 *** Index
389 369
390 370 #+NAME: wiki-index
@@ -401,19 +381,21 @@
401 381 #+END_SRC
402 382
403 383
404 Removed: *** Aerospace
384 Added: *** Engineering
405 385
406 Removed: #+NAME: wiki---aerospace
386 Added: #+NAME: wiki---engineering
407 387 #+BEGIN_SRC emacs-lisp
408 Removed: ("wiki---aerospace"
409 Removed: :base-directory "wiki/aerospace"
388 Added: ("wiki---engineering"
389 Added: :base-directory "wiki/engineering"
410 390 :base-extension "org"
411 Removed: :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/aerospace")
391 Added: :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/engineering")
412 392 :recursive t
413 393 :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
414 394 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
415 395 :auto-sitemap t
416 396 :sitemap-filename "index.org"
397 Added: :html-link-up "https://wiki.mlnp.fr/engineering/"
398 Added: :html-link-home "https://wiki.mlnp.fr"
417 399 :publishing-function org-html-publish-to-html)
418 400 #+END_SRC
419 401
@@ -431,6 +413,8 @@
431 413 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
432 414 :auto-sitemap t
433 415 :sitemap-filename "index.org"
416 Added: :html-link-up "https://wiki.mlnp.fr/emacs/"
417 Added: :html-link-home "https://wiki.mlnp.fr"
434 418 :publishing-function org-html-publish-to-html)
435 419 #+END_SRC
436 420
@@ -448,6 +432,8 @@
448 432 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
449 433 :auto-sitemap t
450 434 :sitemap-filename "index.org"
435 Added: :html-link-up "https://wiki.mlnp.fr/languages/"
436 Added: :html-link-home "https://wiki.mlnp.fr"
451 437 :publishing-function org-html-publish-to-html)
452 438 #+END_SRC
453 439
@@ -465,6 +451,8 @@
465 451 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
466 452 :auto-sitemap t
467 453 :sitemap-filename "index.org"
454 Added: :html-link-up "https://wiki.mlnp.fr/linux/"
455 Added: :html-link-home "https://wiki.mlnp.fr"
468 456 :publishing-function org-html-publish-to-html)
469 457 #+END_SRC
470 458
@@ -482,10 +470,31 @@
482 470 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
483 471 :auto-sitemap t
484 472 :sitemap-filename "index.org"
473 Added: :html-link-up "https://wiki.mlnp.fr/programming/"
474 Added: :html-link-home "https://wiki.mlnp.fr"
485 475 :publishing-function org-html-publish-to-html)
486 476 #+END_SRC
487 477
488 478
479 Added: *** Fitness
480 Added:
481 Added: #+NAME: wiki---fitness
482 Added: #+BEGIN_SRC emacs-lisp
483 Added: ("wiki---fitness"
484 Added: :base-directory "wiki/fitness"
485 Added: :base-extension "org"
486 Added: :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/fitness")
487 Added: :recursive t
488 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
489 Added: <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
490 Added: :auto-sitemap t
491 Added: :sitemap-filename "index.org"
492 Added: :html-link-up "https://wiki.mlnp.fr/fitness/"
493 Added: :html-link-home "https://wiki.mlnp.fr"
494 Added: :publishing-function org-html-publish-to-html)
495 Added: #+END_SRC
496 Added:
497 Added:
489 498 *** Typography
490 499
491 500 #+NAME: wiki---typography
@@ -499,6 +508,8 @@
499 508 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
500 509 :auto-sitemap t
501 510 :sitemap-filename "index.org"
511 Added: :html-link-up "https://wiki.mlnp.fr/typography/"
512 Added: :html-link-home "https://wiki.mlnp.fr"
502 513 :publishing-function org-html-publish-to-html)
503 514 #+END_SRC
504 515
@@ -507,35 +518,36 @@
507 518
508 519 #+NAME: blog.mlnp.fr
509 520 #+BEGIN_SRC emacs-lisp
510 Removed: ("blog.mlnp.fr"
511 Removed: :components ("blog-main-pages"
512 Removed: "blog-resources"
513 Removed: "blog-fonts"))
514 Removed: ("blog-main-pages"
515 Removed: :base-directory "blog/"
516 Removed: :base-extension "org"
517 Removed: :publishing-directory ,(concat org-publish-location-local "blog.mlnp.fr/")
518 Removed: :recursive t
519 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://blog.mlnp.fr/resources/mlnp.css'/>
520 Removed: <link rel='icon' type='image/png' href='https://blog.mlnp.fr/resources/favicon.png'/>"
521 Removed: :auto-sitemap t
522 Removed: :sitemap-title "Sitemap for [[https://blog.mlnp.fr][blog.mlnp.fr]]"
523 Removed: :sitemap-sort-files anti-chronologically
524 Removed: :publishing-function org-html-publish-to-html)
525 Removed: ("blog-resources"
526 Removed: :base-directory "resources/"
527 Removed: :base-extension "css\\|js\\|png"
528 Removed: :publishing-directory ,(concat org-publish-location-local "blog.mlnp.fr/resources/")
529 Removed: :publishing-function org-publish-attachment)
530 Removed: ("blog-fonts"
531 Removed: :base-directory "resources/fonts/"
532 Removed: :base-extension "ttf\\|otf"
533 Removed: :publishing-directory ,(concat org-publish-location-local "blog.mlnp.fr/resources/fonts/")
534 Removed: :publishing-function org-publish-attachment)
521 Added: ("blog.mlnp.fr"
522 Added: :components ("blog-main-pages"
523 Added: "blog-resources"
524 Added: "blog-fonts"))
525 Added: ("blog-main-pages"
526 Added: :base-directory "blog/"
527 Added: :base-extension "org"
528 Added: :publishing-directory ,(concat org-publish-location-local "blog.mlnp.fr/")
529 Added: :recursive t
530 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://blog.mlnp.fr/resources/mlnp.css'/>
531 Added: <link rel='icon' type='image/png' href='https://blog.mlnp.fr/resources/favicon.png'/>"
532 Added: :auto-sitemap t
533 Added: :sitemap-filename "index.org"
534 Added: :sitemap-title "Sitemap for [[https://blog.mlnp.fr][blog.mlnp.fr]]"
535 Added: :sitemap-sort-files chronologically
536 Added: :publishing-function org-html-publish-to-html)
537 Added: ("blog-resources"
538 Added: :base-directory "resources/"
539 Added: :base-extension "css\\|js\\|png"
540 Added: :publishing-directory ,(concat org-publish-location-local "blog.mlnp.fr/resources/")
541 Added: :publishing-function org-publish-attachment)
542 Added: ("blog-fonts"
543 Added: :base-directory "resources/fonts/"
544 Added: :base-extension "ttf\\|otf"
545 Added: :publishing-directory ,(concat org-publish-location-local "blog.mlnp.fr/resources/fonts/")
546 Added: :publishing-function org-publish-attachment)
535 547 #+END_SRC
536 548
537 549
538 Removed: * COMMENT Main publishing logic :main:
550 Added: * Main publishing logic :main:
539 551
540 552 This is the main publishing logic. Execute the following source block
541 553 to build the entire website.
@@ -557,7 +569,6 @@
557 569 (save-window-excursion
558 570 (find-file "cv.org")
559 571 (org-ascii-export-to-ascii))
560 Removed: ;; TODO (org-publish-sitemap "wiki.mlnp.fr")
561 572
562 573 (org-publish org-publish-component)
563 574
@@ -573,7 +584,7 @@
573 584 #+END_SRC
574 585
575 586 #+RESULTS: main
576 Removed: : #<window 95 on *Async Shell Command*>
587 Added: : #<window 57 on *Async Shell Command*>
577 588
578 589 The following links to the locally built homepages are useful after
579 590 building the website locally, to check that everything proceeded smoothly.