diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | backend/dep/ikiwiki | 0 | ||||
| -rw-r--r-- | backend/resilient/__init__.py | 13 | ||||
| -rwxr-xr-x | backend/update.py | 2 | ||||
| -rw-r--r-- | wiki/index.mdwn | 1 |
5 files changed, 17 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index 5f15c26..1da5bc3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "backend/dep/pyFreenet"] path = backend/dep/pyFreenet url = https://github.com/freenet/pyFreenet.git +[submodule "backend/dep/ikiwiki"] + path = backend/dep/ikiwiki + url = git://git.ikiwiki.info/ diff --git a/backend/dep/ikiwiki b/backend/dep/ikiwiki new file mode 160000 +Subproject 957ef2d855348206ebb87d8745dac64ec218f5e diff --git a/backend/resilient/__init__.py b/backend/resilient/__init__.py index fc8c949..dfab073 100644 --- a/backend/resilient/__init__.py +++ b/backend/resilient/__init__.py @@ -1,3 +1,9 @@ +# this is a library to keep a shared repository with many forms of backups + +# atm, git and ikiwiki are required, but it should be reasonable to make other approaches + # git saves history + # ikiwiki connects git to online presentation and collaboration + import fileinput import os import shlex @@ -38,6 +44,7 @@ class git: found = (os.system("git status --porcelain") == 0) if not found: print("ERROR: git not found") + # TODO; download git, place in dep_path, and run from there exit(1) os.system("git submodule init") @@ -74,6 +81,10 @@ class git: def pull(self): if self.remote == None: return False + # TODO: GIT_SSH_COMMAND needs new version of git + # to make it work on old versions, path ssh_config_path on environment + # and use a wrapper script that calls ssh -F + # then place path to wrapper script in os.environ["GIT_SSH"] os.environ["GIT_SSH_COMMAND"] = "ssh -F %s" % ssh_config_path status = os.system("git pull %s master" % self.remote) del os.environ["GIT_SSH_COMMAND"] @@ -91,7 +102,7 @@ class git: class ikiwiki: found = (os.system("ikiwiki --version") == 0) if not found: - print("WARNING: ikiwiki not found, pages will not be built") + print("WARNING: ikiwiki not found. please add code to fetch and build the backend/dep/ikiwiki submodule.") synced = False diff --git a/backend/update.py b/backend/update.py index 50c3983..0f5577a 100755 --- a/backend/update.py +++ b/backend/update.py @@ -27,7 +27,7 @@ if resilient.freenet.freesitemgr.found and resilient.freenet.running: ##################### Instantiate remotes git_repos = [ - resilient.git('git://standingwithresilience.branchable.com/'), + resilient.git('ssh://b-standingwithresilience@standingwithresilience.branchable.com/'), resilient.git('fairlystable-guest:/srv/git/standingwithresilience'), resilient.git('https://gitlab.com/standingwithresilience/standingwithresilience.gitlab.io.git', None) ] diff --git a/wiki/index.mdwn b/wiki/index.mdwn index 6f3392f..534aab8 100644 --- a/wiki/index.mdwn +++ b/wiki/index.mdwn @@ -55,6 +55,7 @@ These networks can help with isolation: On the normal internet, this site is found at: - [branchable.com](https://standingwithresilience.branchable.com/) + - (`git clone git://standingwithresilience.branchable.com/`) - [gitlab.io](https://standingwithresilience.gitlab.io/) - [fairlystable.org](https://fairlystable.org/standingwithresilience/wiki/index/) - [bit.no zeronet public](http://bit.no.com:43110/1GtQ8bkFkhYtKerSdXHKe1z4j9VTmFR5d4) |