updated instructions_git.md for codeberg.org

This commit is contained in:
libBletchley 2019-07-20 14:37:41 -04:00
parent c5426f6d34
commit 9d5b92a47c
1 changed files with 33 additions and 18 deletions

View File

@ -2,10 +2,9 @@
This procedure will give you a cloudflare-tor fork with a
privacy-respecting configuration to do pushes with SSH over Tor using
the onion host for codeberg.org ("CDB"). This procedure is designed
for ***linux***. The first step covers Windows too, but these
instructions probably need more adaptations for Windows and other
platforms.
codeberg.org ("CDB"). This procedure is designed for ***linux***.
The first step covers Windows too, but these instructions probably
need more adaptations for Windows and other platforms.
- Linux: `aptitude install git tor ssh`
@ -14,12 +13,12 @@ platforms.
[1]
```
host notabug-*
hostname qs3zumwfci4tntnd.onion
host codeberg-*
hostname codeberg.org
ForwardX11 no
ProxyCommand connect -4 -S 127.0.01:9050 %h %p
host notabug-snowden
IdentityFile /home/user/.ssh/id_rsa_nab-snowden
ProxyCommand connect -4 -S 127.0.0.1:9050 $(tor-resolve %h 127.0.0.1:9050) %p
host codeberg-snowden
IdentityFile /home/user/.ssh/id_rsa_codeberg-snowden
```
[2]
@ -28,7 +27,10 @@ platforms.
email = BM-yadayadayada6fgnLfybVnCcWf25AGZcgg@bitmessage.ch
name = snowden
[remote "origin"]
url = git@notabug-snowden:snowden/cloudflare-tor.git
url = git@codeberg-snowden:snowden/cloudflare-tor.git
fetch = +refs/heads/*:refs/remotes/origin/*
[remote "upstream"]
url = git@codeberg-snowden:crimeflare/cloudflare-tor.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
@ -37,18 +39,32 @@ platforms.
<ol>
<li> install Git, SSH(Not Windows), and Tor (if you haven't already)
<li> create a `notabug.org` account (username "snowden" will be used for this example)
<li> create an SSH key pair `$ ssh-keygen -t rsa -N '' -C 'snowden at notabug' -f "$HOME"/.ssh/id_rsa_nab-snowden`
<li> create a `codeberg.org` account (username "snowden" will be used for this example)
<li> create an SSH key pair `$ ssh-keygen -t rsa -N '' -C 'snowden at codeberg' -f "$HOME"/.ssh/id_rsa_codeberg-snowden`
<li> edit `$HOME/.ssh/config`[1]
<li> copy `"$HOME"/.ssh/id_rsa_nab-snowden.pub` to clipboard
<li> notabug.org > settings > SSH Keys > add key (paste from clipboard)
<li> copy `"$HOME"/.ssh/id_rsa_codeberg-snowden.pub` to clipboard
<li> codeberg.org > settings > SSH/GPG Keys > add key (paste from clipboard)
<li> $ `firefox https://codeberg.org/crimeflare/cloudflare-tor`
<li> fork it (top right corner)
<li> go to the directory you want the project to be rooted in (hereafter we'll call it `$project_root`).
<li> anonymously download your fork: $ `torsocks git clone https://notabug.org/snowden/cloudflare-tor`
<li> anonymously download your fork: $ `torsocks git clone https://codeberg.org/snowden/cloudflare-tor`
<li> edit `$project_root/cloudflare-tor/.git/config` to include the
account name and email address that will be on every commit, as
well as the URL[2]
<code>
[user]
email = BM-yadayadayada6fgnLfybVnCcWf25AGZcgg@bitmessage.ch
name = snowden
[remote "origin"]
url = git@codeberg-snowden:snowden/cloudflare-tor.git
fetch = +refs/heads/*:refs/remotes/origin/*
[remote "upstream"]
url = git@codeberg-snowden:crimeflare/cloudflare-tor.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
</code>
<li> make your first change
<li> (from `$project_root`) $ `git add . -u -n`
<li> check that the files listed are what you changed and intend to push upstream
@ -63,7 +79,6 @@ platforms.
Notice that only the `git clone` command has a `torsocks` prefix and
all git commands thereafter do not. Whenever git operates on the
cloudflare-tor project, all connections to NAB are automatically over
cloudflare-tor project, all connections to codeberg are automatically over
Tor with this configuration (because the `url` in `.git/config`
references the virtual host `notabug-snowden` in `~/.ssh/config` which
uses the onion address).
references the virtual host `codeberg-snowden` in `~/.ssh/config`).