summaryrefslogtreecommitdiff
path: root/backend/update.py
diff options
context:
space:
mode:
Diffstat (limited to 'backend/update.py')
-rwxr-xr-xbackend/update.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/backend/update.py b/backend/update.py
index 0af3898..8af8fb3 100755
--- a/backend/update.py
+++ b/backend/update.py
@@ -24,16 +24,22 @@ 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 ...")
+os.environ["GIT_SSH_COMMAND"] = "ssh -F backend/auth/ssh-config"
status = 0
-status += os.system("git pull git://standingwithresilience.branchable.com/")
+status += os.system("git pull git://standingwithresilience.branchable.com/ master")
if status != 0:
print("WARNING: failed to pull changes from branchable")
#exit(status)
-#status += os.system("git pull fairlystable-guest:/srv/git/standingwithresilience")
+status += os.system("git pull fairlystable-guest:/srv/git/standingwithresilience master")
+if status != 0:
+ print("WARNING: failed to pull changes from fairlystable")
+ #exit(status)
+
+del os.environ["GIT_SSH_COMMAND"]
# Pull from freenet repos
if found_gitocalypse:
@@ -45,8 +51,12 @@ if found_gitocalypse:
print(":: Pushing to simple repos ...")
+os.environ["GIT_SSH_COMMAND"] = "ssh -F backend/auth/ssh-config"
status += os.system("git push git://standingwithresilience.branchable.com/")
+status += os.system("git push fairlystable-guest:/srv/git/standingwithresilience")
+
+del os.environ["GIT_SSH_COMMAND"]
# Push to freenet repos