Merge branch 'move-website' into website-separationge-website-separation

3 files changed, 61 insertions, 18 deletions

diff --git a/tracker/Merge_wiki_website_and_website.mdwn b/tracker/Merge_wiki_website_and_website.mdwn
index dc43a47..6ea8553 100644
--- a/tracker/Merge_wiki_website_and_website.mdwn
+++ b/tracker/Merge_wiki_website_and_website.mdwn
@@ -5,6 +5,9 @@ and merge the content of the org-mode based into the wiki.
 
 [[gustav]] is working on the branch *fripost-wiki#ge-move-website*.
 
+Requirements
+============
+
 Regarding redesign, the following are requirements:
 
 * Visitors of [https://fripost.org] should be brought to the "Hem" page
@@ -16,6 +19,9 @@ Regarding redesign, the following are requirements:
   should be editable but still displayed as if it was part of the
   website.
 
+Checklist
+=========
+
 Regarding merging, the following is the checklist:
 
 * In *from_wiki*, the following pages should be attended and possibly
@@ -55,7 +61,44 @@ Regarding merging, the following is the checklist:
 * Check whether the content in *material* is available from the
   *propaganda* git repository. If it isn't, do something about it
 * Check where *logo2011.eps* is available elsewhere.
-  
+
+Doubts
+======
+
+There are still some doubts about how to proceed:
+
+**1.** How shall the becoming *fripost.org* be prepared for
+publications from other sources, like the *fripost-meetings* Git
+repository?  Currently publication happens through
+
+    rsync -ruvp --chmod=Dugo+rx,Fugo+r $(send-files) fripost@fripost.org:fripost.org/minutes/
+
+and access through
+
+    https://fripost.org/minutes/<whatever-asked-for>
+
+**2.** I assume press images and similar can be published according to
+the same structure:
+
+    https://fripost.org/images/<whatever-asked-for>
+
+**3.** Regarding how to enforce the soft separation between the wiki
+and the website content, I don't know how to achieve that.
+
+I tried the following idea that did not work. The wiki content is left
+untouched. All website content (apart from *hem.mdwn*) is moved into a
+directory, *website*, and *hem.mdwn* is named *website.mdwn*. Then the
+website is reached through *https://fripost.org* simply by making the
+web server point those request to
+*<path-to-fripost-wiki>/website*. The *website.mdwn* will be
+*<path-to-fripost-wiki>/website/index.html* and default target.
+
+The problem was that links to shared static content (style sheets and
+similar) with relative paths did not work.
+
+Other ideas to track
+====================
+
 Consider to get back to how the certificate pages are accessed. It
 would be more natural to access a certificate page from a side note on
 the "Hem" page, the way it was done in the org-mode based website.
diff --git a/website/certs.asc b/website/certs.asc
index bee6214..0ea6a48 100644
--- a/website/certs.asc
+++ b/website/certs.asc
@@ -9,8 +9,8 @@ immediately! -- admin@fripost.org
 
  * IMAP server
     imap.fripost.org:993
-    SHA1   BE:CA:4E:39:C6:11:6B:FC:70:38:6C:DB:A6:7E:1C:10:2A:E5:09:C4
-    SHA256 12:D5:03:C2:D5:1C:D6:55:A9:50:FB:A4:99:69:E8:DC:3A:DE:50:74:D7:2A:F9:70:F2:80:73:13:CA:4D:56:B1
+    SHA1   8A:81:CF:C3:04:01:BC:C6:58:03:CB:4B:61:F0:C9:0B:09:51:B8:F8
+    SHA256 52:BA:FF:9F:7A:6B:7B:50:51:CB:64:BE:46:72:65:8E:D6:FC:3C:CE:5B:6C:9F:9F:E0:58:00:7B:8F:13:6E:D3
 
  * SMTP servers (STARTTLS)
     smtp.fripost.org:587 (Mail Submission Agent)
@@ -72,17 +72,17 @@ Alternatively, using a pipe:
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJUtBK0AAoJENOaSZw8IaVSDR8P/253K8jPqwgr7g7LLi40Q8js
-ZF915hOcY5CKHHE73PylWl4hMh3CbD73GcQ6338pizNrbmhGVu5omafGCkpJwocW
-dgDsX/pLybzxwx1Z5CQDBNEUpJh1/q/25yZ+11nx/Msf37oEIjiQx3efdL3BSrdV
-VokvTIcUDRWaQqyr/zaBHLH0/yS2caWlWQKgLIyASaWPSXQuwfgTIufX/+h8ni3E
-QK8c7GhFhCTaoU01igRxLexm6abm5F0szDtwEiEejxHyV0EJIC6R2eNIL/jQvXuS
-p3GzcQkw7GX12bYksv+NnqS3VxxZ9Wm1vGx/nraDeVzxZKvAw21i/nw5625i201o
-tFSoH9fKdR4UTksCJZdZyFG3cQ/GAVgJZicsHGzLVeT36Lb+F460iQ95ThTPnJRz
-jSUs9I3EDA1wsy7Jc+kdrH81B7G35p8j3u2TOPWXp5YEaxmDz8bCfinE9u7YUaOt
-4mHJv4RTu6aPbHE1RXY93pjKjCojqi4H1Y6sxyKs2Z4dAXWSJJxRvgc62JLP3TrL
-2lUucGS3vT/cGcZXvxnybOHtG1WYzAnoii+7hyNqdUdVfcroLI1Z3GDzjE5UmvYf
-p0K03H2yK4Rkx1blCpGCRWagccRtGFcaPwMvpV6xGzOFuFewx8kR/88OgM12qDF3
-O5gofR/AotWZyCdaz5au
-=c3XP
+iQIcBAEBCgAGBQJU86fvAAoJENOaSZw8IaVSiucP/3DJRf5aHaWIjHEd2GsSbIfp
+hRLWHXN9bnsXW+z1UK17b8GgaPihlCwDyMbQ5ZXLcEN183z/X40a+Lt0mRJVxTjL
+XLJQYc9P6MapTRPOtuq2mF+RGiIhuXI8ehLF34dF5uVhfId/LshGBc+oH26a4Y+2
+YpLMhjrhQiQwfLHkuf+f5F57EOIJYv8sDj7x2pZXLBAQN+OK7siV1/sJa0trcXZD
+k0oEBgzm9VoIsy76joKnqGPS27sBNL1qmTPjI+hVPcXFQ6C1Irfe8HkWXiMqo1zq
+Xks78ONAo9zkNp4kvHgz4eWNGX15mfWK+kXEtalQtllfB4GioZtFNTN2uZZHa322
+Qb+/OobeOrSLNu635uYTmQXKI9RprYur0csK5hbvpvSAFsw8PKxmubBuKHWmhVxw
+BwJCwbH8GcmSs4ON3R+01Wrv1JMtfixs19wW+gEgvYQO5xTHY6pvDvG78WLmhl+0
+qgni/VuAYtbAyztOlyZEZ8q9lvWC1wlj2DqwHW33PmqQTY46nK8x5C5kodpR4fi7
+Hk0OnhA9LzMEzMdhuDvyzLWdhDSXYyiFLnpPxarl477pQttJ3WvY60H9vsHJwGUB
+MUYkHWCBems0Z8McgGU5i+Djw/WE/DZJWOBn9cBawGw+pG3E+1nJsLg0+NVyDIpR
+G0RR6uhLfleLnI60ljiK
+=lMAq
 -----END PGP SIGNATURE-----
diff --git a/website/certs.mdwn b/website/certs.mdwn
index 268ff64..f621597 100644
--- a/website/certs.mdwn
+++ b/website/certs.mdwn
@@ -10,8 +10,8 @@ Also refer to the [[signed version of this page|certs.asc]]
  * IMAP server
 
     imap.fripost.org:993
-    SHA1   BE:CA:4E:39:C6:11:6B:FC:70:38:6C:DB:A6:7E:1C:10:2A:E5:09:C4
-    SHA256 12:D5:03:C2:D5:1C:D6:55:A9:50:FB:A4:99:69:E8:DC:3A:DE:50:74:D7:2A:F9:70:F2:80:73:13:CA:4D:56:B1
+    SHA1   8A:81:CF:C3:04:01:BC:C6:58:03:CB:4B:61:F0:C9:0B:09:51:B8:F8
+    SHA256 52:BA:FF:9F:7A:6B:7B:50:51:CB:64:BE:46:72:65:8E:D6:FC:3C:CE:5B:6C:9F:9F:E0:58:00:7B:8F:13:6E:D3
 
  * SMTP servers (STARTTLS)