From a0f6e71005bd6d425cc73f33ca4e779616e3a91b Mon Sep 17 00:00:00 2001 From: Karl Semich <0xloem@gmail.com> Date: Sun, 29 May 2016 05:42:43 -0400 Subject: Update to include git history in freenet --- Freenet.mdwn | 2 + TODO.mdwn | 18 +- .../freesitemgr/Standing With Resilience Public | 550 +-------------------- backend/update.py | 62 ++- wiki/Freenet.mdwn | 2 + wiki/TODO.mdwn | 18 +- 6 files changed, 89 insertions(+), 563 deletions(-) diff --git a/Freenet.mdwn b/Freenet.mdwn index e623d12..7525f5c 100644 --- a/Freenet.mdwn +++ b/Freenet.mdwn @@ -7,3 +7,5 @@ href="http://127.0.0.1:8888/USK@hCLgfaINNSNAl4do-PapEincQP5Lxa72d8mFrzHqzqU,jjuB With Resilience Public. Viewing the website on Freenet helps the site survive if there is ever an issue with your normal access to the internet. + +If you are familiar with Freenet, the source of this website may be edited using gitocalypse. It may be fetched from either freenet://USK@hCLgfaINNSNAl4do-PapEincQP5Lxa72d8mFrzHqzqU,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQACAAE/Standing%20With%20Resilience%20Public.git.R1/0 or freenet://USK@PSY0YngeDtGbj60hjEoilQiY9oKzVrptRC0rG4BEVPg,e6ZEjT4KvbsltPBJOeKNpIdty2oGzbLCdk4fsDA5Vdk,AQACAAE/Standing%20With%20Resilience.git.R1/0 and changes may be pushed to freenet://USK@AKL0griFs7T25yw6-JR3Wk7vocvNBelOLg3RwtIL6aTp,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQECAAE/Standing%20With%20Resilience%20Public.git.R1/0 . diff --git a/TODO.mdwn b/TODO.mdwn index 30b83b9..94f0b7b 100644 --- a/TODO.mdwn +++ b/TODO.mdwn @@ -1,6 +1,9 @@ -[ ] Link mirrors on index -[ ] Upload site to freenet +[ ] Link mirrors on branchable, to propogate changes +[ ] Ensure branchable is pulling from other web mirror as well as pushing +[x] Link mirrors on index +[x] Upload site to freenet [x] private site + [x] GITOCALYPSE with private site. use the same key. gitocalypse seems working, haven't cloned successfully yet [ ] Get site linked from major indexes Approaches to try: [ ] add a link from wait @@ -10,12 +13,13 @@ [ ] add site to other indices [ ] the popular one on the front page with a huge list [ ] any that are wikis, listed in index site lists + [x] added to an index wiki [ ] any others listed in index site lists - [ ] public site - [ ] include credentials in repo - [ ] make script to automate update -[ ] Link mirrors on branchable, to propogate changes -[ ] Upload site to zeronet + [x] public site + [x] GITOCALYPSE with public site. use the same key. gitocalyhpse seems working, haven't cloned successfully yet + [x] include credentials in repo + [x] make script to automate update [ ] Upload site to qora [ ] Upload site to ipfs +[ ] Upload site to zeronet [ ] Upload site to project maelstrom? diff --git a/backend/freesitemgr/Standing With Resilience Public b/backend/freesitemgr/Standing With Resilience Public index 22d3024..7605bd4 100644 --- a/backend/freesitemgr/Standing With Resilience Public +++ b/backend/freesitemgr/Standing With Resilience Public @@ -4,9 +4,9 @@ # general site config items name = "Standing With Resilience Public" -dir = "/home/gentoo/src/standingwithresilience.branchable.com/html" -uriPriv = "USK@AKL0griFs7T25yw6-JR3Wk7vocvNBelOLg3RwtIL6aTp,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQECAAE/Standing With Resilience Public/0" -uriPub = "USK@hCLgfaINNSNAl4do-PapEincQP5Lxa72d8mFrzHqzqU,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQACAAE/Standing With Resilience Public/0/" +dir = "../html" +uriPriv = "USK@AKL0griFs7T25yw6-JR3Wk7vocvNBelOLg3RwtIL6aTp,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQECAAE/Standing With Resilience Public/2" +uriPub = "USK@hCLgfaINNSNAl4do-PapEincQP5Lxa72d8mFrzHqzqU,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQACAAE/Standing With Resilience Public/2/" updateInProgress = True insertingManifest = True insertingIndex = False @@ -18,10 +18,10 @@ mtype = "text/html" files = [ { "mimetype": "text/html", - "hash": "29ada928805b7a04a81aa5fcdc9dd3a1578e4166", + "hash": "59573b43cbbbe0a983721a7be56c0444ec284a7a", "name": "Freenet/index.html", "uri": "", - "sizebytes": 1629, + "sizebytes": 1840, "state": "idle", "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/Freenet/index.html", "dda": true, @@ -88,546 +88,6 @@ files = [ "id": "freesitemgr|Standing With Resilience Public|favicon.ico", "target": "manifest" }, - { - "mimetype": "application/octet-stream", - "hash": "7e4442a18d76d986daa6462df78a8236a6652fe5", - "name": "git/COMMIT_EDITMSG", - "uri": "", - "sizebytes": 25, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/COMMIT_EDITMSG", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/COMMIT_EDITMSG", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "b180fbdc2b27a8652ec0662d9e1ce44f327a2735", - "name": "git/FETCH_HEAD", - "uri": "", - "sizebytes": 86, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/FETCH_HEAD", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/FETCH_HEAD", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "acbaef275e46a7f14c1ef456fff2c8bbe8c84724", - "name": "git/HEAD", - "uri": "", - "sizebytes": 23, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/HEAD", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/HEAD", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "7a3cd0f65f3c1b4b89f7713856a9f611ab5ba06a", - "name": "git/ORIG_HEAD", - "uri": "", - "sizebytes": 41, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/ORIG_HEAD", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/ORIG_HEAD", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "fcf17ffe03718411c42016fe9923beb56afb125d", - "name": "git/config", - "uri": "", - "sizebytes": 959, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/config", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/config", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "9635f1b7e12c045212819dd934d809ef07efa2f4", - "name": "git/description", - "uri": "", - "sizebytes": 73, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/description", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/description", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "86b9655a9ebbde13ac8dd5795eb4d5b539edab0f", - "name": "git/hooks/applypatch-msg.sample", - "uri": "", - "sizebytes": 452, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/hooks/applypatch-msg.sample", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/hooks/applypatch-msg.sample", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "ee1ed5aad98a435f2020b6de35c173b75d9affac", - "name": "git/hooks/commit-msg.sample", - "uri": "", - "sizebytes": 896, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/hooks/commit-msg.sample", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/hooks/commit-msg.sample", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "b614c2f63da7dca9f1db2e7ade61ef30448fc96c", - "name": "git/hooks/post-update", - "uri": "", - "sizebytes": 189, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/hooks/post-update", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/hooks/post-update", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "42fa41564917b44183a50c4d94bb03e1768ddad8", - "name": "git/hooks/pre-applypatch.sample", - "uri": "", - "sizebytes": 398, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/hooks/pre-applypatch.sample", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/hooks/pre-applypatch.sample", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "36aed8976dcc08b5076844f0ec645b18bc37758f", - "name": "git/hooks/pre-commit.sample", - "uri": "", - "sizebytes": 1642, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/hooks/pre-commit.sample", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/hooks/pre-commit.sample", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "5c8518bfd1d1d3d2c1a7194994c0a16d8a313a41", - "name": "git/hooks/pre-push.sample", - "uri": "", - "sizebytes": 1348, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/hooks/pre-push.sample", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/hooks/pre-push.sample", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "5885a56ab4fca8075a05a562d005e922cde9853b", - "name": "git/hooks/pre-rebase.sample", - "uri": "", - "sizebytes": 4951, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/hooks/pre-rebase.sample", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/hooks/pre-rebase.sample", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "2b6275eda365cad50d167fe3a387c9bc9fedd54f", - "name": "git/hooks/prepare-commit-msg.sample", - "uri": "", - "sizebytes": 1239, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/hooks/prepare-commit-msg.sample", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/hooks/prepare-commit-msg.sample", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "39355a075977d05708ef74e1b66d09a36e486df1", - "name": "git/hooks/update.sample", - "uri": "", - "sizebytes": 3611, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/hooks/update.sample", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/hooks/update.sample", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "e9c95cc30b5b415526d322dc338fee78c658631a", - "name": "git/index", - "uri": "", - "sizebytes": 1696, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/index", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/index", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "c879df015d97615050afa7b9641e3352a1e701ac", - "name": "git/info/exclude", - "uri": "", - "sizebytes": 240, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/info/exclude", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/info/exclude", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "9d649667f603dc143816ba919cc16f6bdae5373d", - "name": "git/info/refs", - "uri": "", - "sizebytes": 677, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/info/refs", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/info/refs", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "add96d3df30badb6064aff8e609c093a77756ed7", - "name": "git/logs/HEAD", - "uri": "", - "sizebytes": 4374, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/logs/HEAD", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/logs/HEAD", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "649839ba32cff4faa76f0092a02f2be50582524a", - "name": "git/logs/refs/heads/master", - "uri": "", - "sizebytes": 1333, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/logs/refs/heads/master", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/logs/refs/heads/master", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "64693b36e55ed09965ea0b7dac088c910bf449e4", - "name": "git/logs/refs/heads/setup", - "uri": "", - "sizebytes": 530, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/logs/refs/heads/setup", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/logs/refs/heads/setup", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "f6954dde85ab8d7710120100c4791d5582a771c1", - "name": "git/logs/refs/remotes/annex/master", - "uri": "", - "sizebytes": 145, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/logs/refs/remotes/annex/master", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/logs/refs/remotes/annex/master", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "3f2174a69c5ee9c9b4487bdca3495290efdd5d6b", - "name": "git/logs/refs/remotes/baffo32/master", - "uri": "", - "sizebytes": 303, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/logs/refs/remotes/baffo32/master", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/logs/refs/remotes/baffo32/master", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "46a7aa42a6d01ad5f260b1587b0570965813f831", - "name": "git/logs/refs/remotes/baffo32/setup", - "uri": "", - "sizebytes": 158, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/logs/refs/remotes/baffo32/setup", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/logs/refs/remotes/baffo32/setup", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "b934d1f4ca41d503dc93de0a38d729f1fba2500f", - "name": "git/logs/refs/remotes/fairlystable-ssh/master", - "uri": "", - "sizebytes": 145, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/logs/refs/remotes/fairlystable-ssh/master", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/logs/refs/remotes/fairlystable-ssh/master", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "ab0e319bef11b52b50c5a18619003946659523ea", - "name": "git/logs/refs/remotes/fairlystable-ssh/setup", - "uri": "", - "sizebytes": 145, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/logs/refs/remotes/fairlystable-ssh/setup", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/logs/refs/remotes/fairlystable-ssh/setup", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "ed1aa98d6a545c1abd1edb26a7ac247b50c570fb", - "name": "git/logs/refs/remotes/origin/HEAD", - "uri": "", - "sizebytes": 187, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/logs/refs/remotes/origin/HEAD", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/logs/refs/remotes/origin/HEAD", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "1b0702be81e4e6cf64b799014697e4f7aef205a2", - "name": "git/logs/refs/remotes/origin/master", - "uri": "", - "sizebytes": 439, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/logs/refs/remotes/origin/master", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/logs/refs/remotes/origin/master", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "6991bbfa4e29e9780093f9d614b3ce45de08d1c5", - "name": "git/objects/0e/cfc26557a0feea49797ac610a6c60bcb763070", - "uri": "", - "sizebytes": 31, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/0e/cfc26557a0feea49797ac610a6c60bcb763070", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/0e/cfc26557a0feea49797ac610a6c60bcb763070", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "6e13e81d57c1d779c1b8917463960d401504da98", - "name": "git/objects/13/25fbfdcca1c1a3ea2a00e69ed4829ba160aecc", - "uri": "", - "sizebytes": 33, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/13/25fbfdcca1c1a3ea2a00e69ed4829ba160aecc", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/13/25fbfdcca1c1a3ea2a00e69ed4829ba160aecc", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "258b04052258a8d7234fdaace38f3d77d38845fc", - "name": "git/objects/1a/cb3d4aaeab4e1ca47ff275be9545ace37b2407", - "uri": "", - "sizebytes": 2189, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/1a/cb3d4aaeab4e1ca47ff275be9545ace37b2407", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/1a/cb3d4aaeab4e1ca47ff275be9545ace37b2407", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "ae89bc98e55ec39dfb9ad4608622aa0445a293a2", - "name": "git/objects/34/0837d377d98cf6cedfc796d6e94e4ce23750a6", - "uri": "", - "sizebytes": 2999, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/34/0837d377d98cf6cedfc796d6e94e4ce23750a6", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/34/0837d377d98cf6cedfc796d6e94e4ce23750a6", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "a131447db3877425ef71ba23097bd51cbbc61f31", - "name": "git/objects/45/bebceb28b199ed37bb810560164d521b04d4ab", - "uri": "", - "sizebytes": 1375, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/45/bebceb28b199ed37bb810560164d521b04d4ab", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/45/bebceb28b199ed37bb810560164d521b04d4ab", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "6991815313ec54e1d2b80b15ad63a88d7dd91bdd", - "name": "git/objects/80/9efcf8bbbb05ddc63f6b28e48be19e06cb0113", - "uri": "", - "sizebytes": 43, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/80/9efcf8bbbb05ddc63f6b28e48be19e06cb0113", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/80/9efcf8bbbb05ddc63f6b28e48be19e06cb0113", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "c531a7f889c0158354a4160e210cc168086493ef", - "name": "git/objects/a2/186a624c78a23651e061bd06723b41f9a5ed0a", - "uri": "", - "sizebytes": 35991, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/a2/186a624c78a23651e061bd06723b41f9a5ed0a", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/a2/186a624c78a23651e061bd06723b41f9a5ed0a", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "bdf6e836c0bbfb33770792fb251843aa95ca2b4c", - "name": "git/objects/ac/1d27316ae46e24411737e311618f44b4f8dca0", - "uri": "", - "sizebytes": 372, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/ac/1d27316ae46e24411737e311618f44b4f8dca0", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/ac/1d27316ae46e24411737e311618f44b4f8dca0", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "ee0822d60127c42d8b4942a5e3d7b2b720847a5f", - "name": "git/objects/ac/7af2e80e3a7920c6989974744a27c21db8cd33", - "uri": "", - "sizebytes": 22, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/ac/7af2e80e3a7920c6989974744a27c21db8cd33", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/ac/7af2e80e3a7920c6989974744a27c21db8cd33", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "6b0a76d46ab2f1c23ff96a2173c1835315624c42", - "name": "git/objects/e6/1d1ab5d8cf3fb88613ac0417b13c4507b150b0", - "uri": "", - "sizebytes": 29, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/e6/1d1ab5d8cf3fb88613ac0417b13c4507b150b0", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/e6/1d1ab5d8cf3fb88613ac0417b13c4507b150b0", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "c7976afa807043eef7e08fd002076b5b00202627", - "name": "git/objects/e7/67670b4fad8d258fa599bedccc0d1f53f1e226", - "uri": "", - "sizebytes": 34, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/e7/67670b4fad8d258fa599bedccc0d1f53f1e226", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/e7/67670b4fad8d258fa599bedccc0d1f53f1e226", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "505ad33c4b1bcdf7f49e0ae9bf30eb8e9a154aa1", - "name": "git/objects/fe/5379cf74aaa8645f8386228c9369937082edf3", - "uri": "", - "sizebytes": 28, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/fe/5379cf74aaa8645f8386228c9369937082edf3", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/fe/5379cf74aaa8645f8386228c9369937082edf3", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "aaae468c349f91297b62e17f0ba1ae954f17932c", - "name": "git/objects/info/packs", - "uri": "", - "sizebytes": 54, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/info/packs", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/info/packs", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "93009ab5460c0617a42320368614efb88661df98", - "name": "git/objects/pack/pack-427e95dfaef996e77f138728b7b82d39e73f1703.idx", - "uri": "", - "sizebytes": 3844, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/pack/pack-427e95dfaef996e77f138728b7b82d39e73f1703.idx", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/pack/pack-427e95dfaef996e77f138728b7b82d39e73f1703.idx", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "34e4d554f683e80178c9422452ff53217ed76508", - "name": "git/objects/pack/pack-427e95dfaef996e77f138728b7b82d39e73f1703.pack", - "uri": "", - "sizebytes": 28227, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/objects/pack/pack-427e95dfaef996e77f138728b7b82d39e73f1703.pack", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/objects/pack/pack-427e95dfaef996e77f138728b7b82d39e73f1703.pack", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "d106a09985195982d134adff0993c8d6d60743c5", - "name": "git/packed-refs", - "uri": "", - "sizebytes": 650, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/packed-refs", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/packed-refs", - "target": "manifest" - }, - { - "mimetype": "application/octet-stream", - "hash": "d9427cda09aba1cdde5c69c2b13c905bddb0bc51", - "name": "git/refs/remotes/origin/HEAD", - "uri": "", - "sizebytes": 32, - "state": "idle", - "path": "/home/gentoo/src/standingwithresilience.branchable.com/html/git/refs/remotes/origin/HEAD", - "dda": true, - "id": "freesitemgr|Standing With Resilience Public|git/refs/remotes/origin/HEAD", - "target": "manifest" - }, { "mimetype": "text/html", "hash": "72fcf44124c707a739819b5babf2b99ab8b45c79", diff --git a/backend/update.py b/backend/update.py index f605b39..0c10e66 100755 --- a/backend/update.py +++ b/backend/update.py @@ -2,24 +2,78 @@ import os +found_git = (os.system("git status --porcelain") == 0) + +if not found_git: + print("ERROR: git not found") + exit(1) + +found_ikiwiki = (os.system("ikiwiki --version") == 0) +found_gitocalypse = (os.system("git-remote-freenet") == 256) +found_freesitemgr = (os.system("freesitemgr --version") == 0) + +if not found_ikiwiki: + print("WARNING: ikiwiki not found, pages will not be built") +if not found_gitocalypse: + print("WARNING: gitocalypse not found, changes won't be synced with freenet") +if not found_freesitemgr: + print("WARNING: freesitemgr/pyFreenet not found, public freesite won't be updated") + +if not (found_ikiwiki or found_gitocalypse or found_freesitemgr): + print("Changes will still be propagated if branchable is working.") + +print(":: Pulling from simple repos ...") + status = 0 status += os.system("git pull git://standingwithresilience.branchable.com/") -#status += os.system("git pull fairlystable-guest:/srv/git/standingwithresilience") if status != 0: - exit(status) + print("WARNING: failed to pull changes from branchable") + #exit(status) + +#status += os.system("git pull fairlystable-guest:/srv/git/standingwithresilience") + + +# Pull from freenet repos +if found_gitocalypse: + print(":: Pulling from freenet repos ...") + # public freenet + os.system("git pull freenet://USK@hCLgfaINNSNAl4do-PapEincQP5Lxa72d8mFrzHqzqU,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQACAAE/Standing%20With%20Resilience%20Public.git.R1/0 master") + # private freenet + os.system("git pull freenet://USK@PSY0YngeDtGbj60hjEoilQiY9oKzVrptRC0rG4BEVPg,e6ZEjT4KvbsltPBJOeKNpIdty2oGzbLCdk4fsDA5Vdk,AQACAAE/Standing%20With%20Resilience.git.R1/0 master") + + +print(":: Pushing to simple repos ...") status += os.system("git push git://standingwithresilience.branchable.com/") -status += os.system("git gc --prune=0") + + +# Push to freenet repos +if found_gitocalypse: + print (":: Pushing to freenet repos ...") + # public freenet + os.system("git push freenet://USK@AKL0griFs7T25yw6-JR3Wk7vocvNBelOLg3RwtIL6aTp,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQECAAE/Standing%20With%20Resilience%20Public.git.R1/0") + #private freenet + ##### + + +# Build wiki if status != 0: exit(status) +if not found_ikiwiki: + exit(0) + +print (":: Building wiki ...") + status += os.system("ikiwiki --rebuild ../wiki ../html") if status != 0: exit(status) -status += os.system("freesitemgr -c freesitemgr -v -l freesitemgr.log -r 0 update") +if found_freesitemgr: + print (":: Publishing freesite ...") + status += os.system("freesitemgr -c freesitemgr -v -l freesitemgr.log -r 0 update") print "Done." diff --git a/wiki/Freenet.mdwn b/wiki/Freenet.mdwn index e623d12..7525f5c 100644 --- a/wiki/Freenet.mdwn +++ b/wiki/Freenet.mdwn @@ -7,3 +7,5 @@ href="http://127.0.0.1:8888/USK@hCLgfaINNSNAl4do-PapEincQP5Lxa72d8mFrzHqzqU,jjuB With Resilience Public. Viewing the website on Freenet helps the site survive if there is ever an issue with your normal access to the internet. + +If you are familiar with Freenet, the source of this website may be edited using gitocalypse. It may be fetched from either freenet://USK@hCLgfaINNSNAl4do-PapEincQP5Lxa72d8mFrzHqzqU,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQACAAE/Standing%20With%20Resilience%20Public.git.R1/0 or freenet://USK@PSY0YngeDtGbj60hjEoilQiY9oKzVrptRC0rG4BEVPg,e6ZEjT4KvbsltPBJOeKNpIdty2oGzbLCdk4fsDA5Vdk,AQACAAE/Standing%20With%20Resilience.git.R1/0 and changes may be pushed to freenet://USK@AKL0griFs7T25yw6-JR3Wk7vocvNBelOLg3RwtIL6aTp,jjuBPGO~oCByVoZ5f4Bny0Gp-l3kuDOtf3m-QBT4ekA,AQECAAE/Standing%20With%20Resilience%20Public.git.R1/0 . diff --git a/wiki/TODO.mdwn b/wiki/TODO.mdwn index 30b83b9..94f0b7b 100644 --- a/wiki/TODO.mdwn +++ b/wiki/TODO.mdwn @@ -1,6 +1,9 @@ -[ ] Link mirrors on index -[ ] Upload site to freenet +[ ] Link mirrors on branchable, to propogate changes +[ ] Ensure branchable is pulling from other web mirror as well as pushing +[x] Link mirrors on index +[x] Upload site to freenet [x] private site + [x] GITOCALYPSE with private site. use the same key. gitocalypse seems working, haven't cloned successfully yet [ ] Get site linked from major indexes Approaches to try: [ ] add a link from wait @@ -10,12 +13,13 @@ [ ] add site to other indices [ ] the popular one on the front page with a huge list [ ] any that are wikis, listed in index site lists + [x] added to an index wiki [ ] any others listed in index site lists - [ ] public site - [ ] include credentials in repo - [ ] make script to automate update -[ ] Link mirrors on branchable, to propogate changes -[ ] Upload site to zeronet + [x] public site + [x] GITOCALYPSE with public site. use the same key. gitocalyhpse seems working, haven't cloned successfully yet + [x] include credentials in repo + [x] make script to automate update [ ] Upload site to qora [ ] Upload site to ipfs +[ ] Upload site to zeronet [ ] Upload site to project maelstrom? -- cgit v1.2.3