summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Semich <0xloem@gmail.com>2016-06-01 20:47:12 -0400
committerKarl Semich <0xloem@gmail.com>2016-06-01 20:47:12 -0400
commitb5f398f8ffceb9e329c4a99eac918812f547dd75 (patch)
tree68a075c80a57330a0c46dc3b3174e9c0257b4710
parent5edbd82dcd165bedea5ae583faa76fe909ef4083 (diff)
downloadstandingwithresilience-b5f398f8ffceb9e329c4a99eac918812f547dd75.tar.gz
standingwithresilience-b5f398f8ffceb9e329c4a99eac918812f547dd75.zip
add fairlystable to update.py
-rw-r--r--backend/auth/guest_id_rsa.pub2
-rw-r--r--backend/auth/ssh-config2
-rwxr-xr-xbackend/update.py14
3 files changed, 14 insertions, 4 deletions
diff --git a/backend/auth/guest_id_rsa.pub b/backend/auth/guest_id_rsa.pub
index fa185a7..3482fd8 100644
--- a/backend/auth/guest_id_rsa.pub
+++ b/backend/auth/guest_id_rsa.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLhauHwf4/BBDqM0wGuqw9W/nkiib7rcq+bqcFc9OCqMzvt8BFg9XRlx3F9aSduEntF9GcHICaYGivcHe7+euecf0rmOz9x9+4b0Sy/Bf1a9RTXHHYHqS5rIuYaH/g5DfFzyogKH3kWNmDLXZNLec/UZwWJR8gEdWOcWm8TViEZeBo7Asqrp10KEs0DoZT3d4VmWiDUesuVjuCleQYGqcdKfCZjm3Qm1HAVLJcZIQAv30tgxLNuNZc3OhBQhkvpZzeZK+3MdYC7c1jfcWtuWKOh6Z2u1d5TCDi7Iap1ltJThPUiGjkU9oiYBxL3rtpZTSYZWyvEzjtVU4GUpvxfzxZ gentoo@livecd
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLhauHwf4/BBDqM0wGuqw9W/nkiib7rcq+bqcFc9OCqMzvt8BFg9XRlx3F9aSduEntF9GcHICaYGivcHe7+euecf0rmOz9x9+4b0Sy/Bf1a9RTXHHYHqS5rIuYaH/g5DfFzyogKH3kWNmDLXZNLec/UZwWJR8gEdWOcWm8TViEZeBo7Asqrp10KEs0DoZT3d4VmWiDUesuVjuCleQYGqcdKfCZjm3Qm1HAVLJcZIQAv30tgxLNuNZc3OhBQhkvpZzeZK+3MdYC7c1jfcWtuWKOh6Z2u1d5TCDi7Iap1ltJThPUiGjkU9oiYBxL3rtpZTSYZWyvEzjtVU4GUpvxfzxZ
diff --git a/backend/auth/ssh-config b/backend/auth/ssh-config
index 384cf87..f2c1379 100644
--- a/backend/auth/ssh-config
+++ b/backend/auth/ssh-config
@@ -1,4 +1,4 @@
Host fairlystable-guest
Hostname fairlystable.org
User guest
- IdentityFile auth/guest_id_rsa
+ IdentityFile backend/auth/guest_id_rsa
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