diff options
| -rw-r--r-- | git.html | 17 | ||||
| -rw-r--r-- | irc.html | 24 |
2 files changed, 22 insertions, 19 deletions
| diff --git a/git.html b/git.html index acf054a..7ad7d70 100644 --- a/git.html +++ b/git.html | |||
| @@ -16,23 +16,16 @@ | |||
| 16 | <p>clone and push over ssh (accounts only):</p> | 16 | <p>clone and push over ssh (accounts only):</p> |
| 17 | <pre>git clone git:druid520/site.git</pre> | 17 | <pre>git clone git:druid520/site.git</pre> |
| 18 | <p>accounts get ssh commands too:</p> | 18 | <p>accounts get ssh commands too:</p> |
| 19 | <pre>ssh git mk <repo> | 19 | <pre>ssh git mk repo |
| 20 | ssh git desc <repo> "description" | 20 | ssh git desc repo "description" |
| 21 | ssh git perms <repo> +WRITERS <user> | 21 | ssh git perms repo +WRITERS user |
| 22 | ssh git ls</pre> | 22 | ssh git ls</pre> |
| 23 | <p>put this in ~/.ssh/config:</p> | 23 | <p>put this in ~/.ssh/config:</p> |
| 24 | <pre>Host serv | 24 | <pre>Host git |
| 25 | HostName 0druid.cc | ||
| 26 | User root | ||
| 27 | Port 3447 | ||
| 28 | IdentityFile ~/.ssh/serv | ||
| 29 | ProxyCommand sh -c "nc -z -w 1 %h 47910; exec nc %h %p" | ||
| 30 | |||
| 31 | Host git | ||
| 32 | HostName git.0druid.cc | 25 | HostName git.0druid.cc |
| 33 | User git | 26 | User git |
| 34 | Port 3447 | 27 | Port 3447 |
| 35 | IdentityFile ~/.ssh/druid | 28 | IdentityFile ~/.ssh/key |
| 36 | ProxyCommand sh -c "nc -z -w 1 %h 47910; exec nc %h %p"</pre> | 29 | ProxyCommand sh -c "nc -z -w 1 %h 47910; exec nc %h %p"</pre> |
| 37 | <p>the serv host is the server itself, it knocks a secret port before ssh answers so scanners see nothing. the git host is the same machine, same deal.</p> | 30 | <p>the serv host is the server itself, it knocks a secret port before ssh answers so scanners see nothing. the git host is the same machine, same deal.</p> |
| 38 | <p>profiles: push a repo named the same as your username (like druid520/druid520) with a profile.png and a readme.djot in it, first line like this:</p> | 31 | <p>profiles: push a repo named the same as your username (like druid520/druid520) with a profile.png and a readme.djot in it, first line like this:</p> |
| diff --git a/irc.html b/irc.html index 2c49e0f..8514255 100644 --- a/irc.html +++ b/irc.html | |||
| @@ -9,20 +9,30 @@ | |||
| 9 | <body> | 9 | <body> |
| 10 | <h1>irc.0druid.cc</h1> | 10 | <h1>irc.0druid.cc</h1> |
| 11 | <p><a href="/">homepage</a>. <a href="/git.html">git</a>. <a href="/irc.html">irc</a>.</p> | 11 | <p><a href="/">homepage</a>. <a href="/git.html">git</a>. <a href="/irc.html">irc</a>.</p> |
| 12 | <p>my irc server. tls only, on 6697. it runs ergo, and it officially supports <a href="https://git.causal.agency/catgirl/about/">catgirl</a> (thats what i use).</p> | 12 | <p>my irc server, invite only. tls only on port 6697, it runs ergo, and it officially supports <a href="https://git.causal.agency/catgirl/about/">catgirl</a> (thats what i use).</p> |
| 13 | <p>its no-kyc: no email, no real name, no questions. just nick + password, then optionally a cert for passwordless login from catgirl.</p> | 13 | <p>its no email. just nick + password, then optionally a cert for passwordless login from catgirl.</p> |
| 14 | <p>connect with catgirl:</p> | 14 | <p>connect with catgirl:</p> |
| 15 | <pre>catgirl -h irc.0druid.cc -p 6697</pre> | 15 | <pre>catgirl -h irc.0druid.cc -p 6697</pre> |
| 16 | <p>first time, register your account (nick + password, no email needed):</p> | 16 | <p>first time, register your account (nick + password):</p> |
| 17 | <pre>/msg NickServ REGISTER <nick> <password></pre> | 17 | <pre>/msg NickServ REGISTER nick pass</pre> |
| 18 | <p>then you can log in with sasl. put this in ~/.config/catgirl/irc.0druid.cc:</p> | 18 | <p>then you can log in with sasl. put this in ~/.config/catgirl/irc.0druid.cc:</p> |
| 19 | <pre>nick = <nick> | 19 | <pre>host = irc.0druid.cc |
| 20 | sasl-plain = <nick>:<password></pre> | 20 | port = 6697 |
| 21 | sasl-plain = nick:pass | ||
| 22 | nick = nick | ||
| 23 | user = nick | ||
| 24 | real = nick | ||
| 25 | pass = servpass</pre> | ||
| 21 | <p>or, do it without a password at all: add your tls cert to your account. connect with your cert, log in once, then:</p> | 26 | <p>or, do it without a password at all: add your tls cert to your account. connect with your cert, log in once, then:</p> |
| 22 | <pre>/msg NickServ CERT ADD</pre> | 27 | <pre>/msg NickServ CERT ADD</pre> |
| 23 | <p>and switch to cert-only auth:</p> | 28 | <p>and switch to cert-only auth:</p> |
| 24 | <pre>nick = <nick> | 29 | <pre>host = irc.0druid.cc |
| 30 | port = 6697 | ||
| 25 | sasl-external | 31 | sasl-external |
| 32 | nick = nick | ||
| 33 | user = nick | ||
| 34 | real = nick | ||
| 35 | pass = servpass | ||
| 26 | cert = ~/.config/catgirl/cert.pem</pre> | 36 | cert = ~/.config/catgirl/cert.pem</pre> |
| 27 | <p>that cert + key is a self-signed tls client cert you make once:</p> | 37 | <p>that cert + key is a self-signed tls client cert you make once:</p> |
| 28 | <pre>catgirl -g ~/.config/catgirl/cert.pem</pre> | 38 | <pre>catgirl -g ~/.config/catgirl/cert.pem</pre> |
