From 7cfb57b9b8770cabc325b6ea8343dd010b46cc55 Mon Sep 17 00:00:00 2001 From: Jan-Erik Rediger Date: Sat, 6 Jan 2024 19:07:51 +0200 Subject: [PATCH] Remove old 4-space indentation across old blog posts --- .../2011-01-23-static-blog-system-improved.md | 17 ++--- _posts/2011-01-26-ipv6-with-nodejs.md | 24 +++---- _posts/2011-09-02-kramdown-test.md | 1 - _posts/2011-09-08-running-on-ssl.md | 9 +-- ...11-09-27-running-etherpad-lite-on-nginx.md | 44 +++++++------ ...2011-10-02-fast-and-simple-proxy-server.md | 53 ++++++++------- _posts/2011-10-18-using-ipvwith-inetd.md | 23 ++++--- ...1-12-25-network-config-without-ifconfig.md | 64 ++++++++++--------- 8 files changed, 126 insertions(+), 109 deletions(-) diff --git a/_posts/2011-01-23-static-blog-system-improved.md b/_posts/2011-01-23-static-blog-system-improved.md index d9ba0be..4351d7f 100644 --- a/_posts/2011-01-23-static-blog-system-improved.md +++ b/_posts/2011-01-23-static-blog-system-improved.md @@ -22,13 +22,14 @@ You can find the script here: [watch.js](http://tmp.fnordig.de/watch.js). It's m The small app.js is just this: - socket = new io.Socket('localhost'); - socket.connect(); - socket.on('message', function(data){ - data = JSON.parse(data); - if(data.reload) - window.location.reload(); - }); -{:lang="javascript"} +```javascript +socket = new io.Socket('localhost'); +socket.connect(); +socket.on('message', function(data){ + data = JSON.parse(data); + if(data.reload) + window.location.reload(); +}); +``` So next thing: individual pages for posts, maybe templates. diff --git a/_posts/2011-01-26-ipv6-with-nodejs.md b/_posts/2011-01-26-ipv6-with-nodejs.md index 7b19cc4..dbdb471 100644 --- a/_posts/2011-01-26-ipv6-with-nodejs.md +++ b/_posts/2011-01-26-ipv6-with-nodejs.md @@ -19,21 +19,23 @@ As I really like [node.js](http://nodejs.org/) I wanted to know how it handles v It's as easy as this: - var http = require('http'); - var server = http.createServer(function (request, response) { - response.writeHead(200, {"Content-Type":"text/plain"}); - response.end ("Hello World!\n"); - console.log("Got a connection"); - }); - server.listen(80, "2a01:xxxx:xxxx:xxxx::2"); - console.log("Server running on localhost at port 80"); -{:lang="javascript"} +```javascript +var http = require('http'); +var server = http.createServer(function (request, response) { + response.writeHead(200, {"Content-Type":"text/plain"}); + response.end ("Hello World!\n"); + console.log("Got a connection"); +}); +server.listen(80, "2a01:xxxx:xxxx:xxxx::2"); +console.log("Server running on localhost at port 80"); +``` Just pass the IPv6 address as the host parameter to `server.listen`. This listens on just one IP; it's possible to listen on all, similar to the `0.0.0.0` for IPv4: - server.listen(80, "::0"); -{:lang="javascript"} +```javascript +server.listen(80, "::0"); +``` Other things worth to mention: diff --git a/_posts/2011-09-02-kramdown-test.md b/_posts/2011-09-02-kramdown-test.md index 31000e8..98a6239 100644 --- a/_posts/2011-09-02-kramdown-test.md +++ b/_posts/2011-09-02-kramdown-test.md @@ -34,7 +34,6 @@ Adding syntax-highlighted code in your post now works like this: even multi-line and define language after code block {:lang="ruby"} -{:lang="text"} And now some real highlighting to show it in action: diff --git a/_posts/2011-09-08-running-on-ssl.md b/_posts/2011-09-08-running-on-ssl.md index ca76821..593f662 100644 --- a/_posts/2011-09-08-running-on-ssl.md +++ b/_posts/2011-09-08-running-on-ssl.md @@ -15,10 +15,11 @@ My SSL certificate is signed by [cacert][] (they approved me at last year's FrOS If you're using nginx, all you need to do is adding the following lines to your config: - listen 443 ssl; - ssl_certificate /path/to/your/cert.pem; - ssl_certificate_key /path/to/your/key.pem; -{:lang="text"} +``` +listen 443 ssl; +ssl_certificate /path/to/your/cert.pem; +ssl_certificate_key /path/to/your/key.pem; +``` If you followed some of the latest news around the scene, you probably heard of the [diginotar debacle][diginotar]. This should make clear how broken the system is and how unsecure these SSL certificates can be with all those CAs around. diff --git a/_posts/2011-09-27-running-etherpad-lite-on-nginx.md b/_posts/2011-09-27-running-etherpad-lite-on-nginx.md index 795f257..e0cd3c0 100644 --- a/_posts/2011-09-27-running-etherpad-lite-on-nginx.md +++ b/_posts/2011-09-27-running-etherpad-lite-on-nginx.md @@ -33,34 +33,36 @@ etherpad runs as an own user named `etherpad` and is monitored by monit. The monitoring is as simple as that, `/etc/monit/apps/etherpad.monit`: - check process etherpad - with pidfile /var/run/etherpad-lite.pid - start program = "/home/etherpad/etherpad-lite/daemon.sh start" - stop program = "/home/etherpad/etherpad-lite/daemon.sh stop" - if totalmem is greater than 300 MB for 10 cycles then restart # eating up memory? -{:lang="text"} +``` +check process etherpad + with pidfile /var/run/etherpad-lite.pid + start program = "/home/etherpad/etherpad-lite/daemon.sh start" + stop program = "/home/etherpad/etherpad-lite/daemon.sh stop" + if totalmem is greater than 300 MB for 10 cycles then restart # eating up memory? +``` And the nginx is nothing fancy at all, `/usr/local/nginx/conf/vhosts/pad.fnordig.de.conf`: - server { - listen 80; - listen [::]:80; - listen 443 ssl; - ssl_certificate /var/certs/star_fnordig_signed.pem; - ssl_certificate_key /var/certs/star_fnordig_signed.pem; +``` +server { + listen 80; + listen [::]:80; + listen 443 ssl; + ssl_certificate /var/certs/star_fnordig_signed.pem; + ssl_certificate_key /var/certs/star_fnordig_signed.pem; - server_name pad.fnordig.de; + server_name pad.fnordig.de; - access_log /home/etherpad/etherpad-lite-log/eplite.access.log; - error_log /home/etherpad/etherpad-lite-log/eplite.error.log; + access_log /home/etherpad/etherpad-lite-log/eplite.access.log; + error_log /home/etherpad/etherpad-lite-log/eplite.error.log; - location / { - proxy_pass http://localhost:9001/; - proxy_set_header Host $host; - proxy_buffering off; - } + location / { + proxy_pass http://localhost:9001/; + proxy_set_header Host $host; + proxy_buffering off; } -{:lang="text"} +} +``` My etherpad is currently running for about 22 days without any problems. I don't really use it myself and have no current statistics on outside usage of [pad.fnordig.de](https://pad.fnordig.de/). diff --git a/_posts/2011-10-02-fast-and-simple-proxy-server.md b/_posts/2011-10-02-fast-and-simple-proxy-server.md index 8fb8f93..e381ac2 100644 --- a/_posts/2011-10-02-fast-and-simple-proxy-server.md +++ b/_posts/2011-10-02-fast-and-simple-proxy-server.md @@ -37,46 +37,51 @@ end and start it with - proxymachine -h 0.0.0.0 -p 1234 -c your_socks_config.rb -{:lang="text"} +``` +proxymachine -h 0.0.0.0 -p 1234 -c your_socks_config.rb +``` Tada! You got your own [SOCKS4](http://en.wikipedia.org/wiki/SOCKS#SOCKS4) Proxy up and running. [@nerdsein](https://twitter.com/#!/nerdsein/status/120258441041297409) got another solution: [Mocks](http://sourceforge.net/projects/mocks/), "**M**y **O**wn so**CK**s **S**erver." Download it over at Sourceforge, unpack it and compile the code with: - gcc -lnsl -o mocks child.c error.c misc.c socksd.c up_proxy.c -{:lang="text"} +``` +gcc -lnsl -o mocks child.c error.c misc.c socksd.c up_proxy.c +``` You can configure a little bit more than with proxymachine, but you can stick with the default config for now: +``` +PORT = 10080 +MOCKS_ADDR = 0.0.0.0 +LOG_FILE = mocks.log +PID_FILE = mocks.pid +BUFFER_SIZE = 65536 +BACKLOG = 5 +NEGOTIATION_TIMEOUT = 5 +CONNECTION_IDLE_TIMEOUT = 300 +BIND_TIMEOUT = 30 +SHUTDOWN_TIMEOUT = 3 +MAX_CONNECTIONS = 50 - PORT = 10080 - MOCKS_ADDR = 0.0.0.0 - LOG_FILE = mocks.log - PID_FILE = mocks.pid - BUFFER_SIZE = 65536 - BACKLOG = 5 - NEGOTIATION_TIMEOUT = 5 - CONNECTION_IDLE_TIMEOUT = 300 - BIND_TIMEOUT = 30 - SHUTDOWN_TIMEOUT = 3 - MAX_CONNECTIONS = 50 - - FILTER_POLICY = ALLOW -{:lang="text"} +FILTER_POLICY = ALLOW +``` See the README and the config file in the archive for comments on it. Then start it with: - src/mocks -c mocks.config start -{:lang="text"} +``` +src/mocks -c mocks.config start +``` and kill it with: - src/mocks -c mocks.config shutdown -{:lang="text"} +``` +src/mocks -c mocks.config shutdown +``` Oh, and in case you have the possibility to just ssh to the server, you can start up a SOCKS proxy on this connection, too: - ssh -D1234 example.com -{:lang="text"} +``` +ssh -D1234 example.com +``` diff --git a/_posts/2011-10-18-using-ipvwith-inetd.md b/_posts/2011-10-18-using-ipvwith-inetd.md index 9c30984..2ee473e 100644 --- a/_posts/2011-10-18-using-ipvwith-inetd.md +++ b/_posts/2011-10-18-using-ipvwith-inetd.md @@ -16,8 +16,9 @@ Complete taking down the machine and reinstalling everything was not an option, By default the jabber server listens on all IPv6 addresses of the host machine, so all I needed to do here was enabling ssl-serving over IPv6 for it: - 2001:0db8:85a3:08d3:1319:8a2e:0370:7344 -{:lang="text"} +``` +2001:0db8:85a3:08d3:1319:8a2e:0370:7344 +``` (this is a completeley random ipv6 addresses ;) Now to the "hard" part: the bitlbee thing. @@ -28,24 +29,28 @@ But, as I told before, the server is a rather old installation and uses `netkit- So I had to replace this one: - apt-get install netbsd-inetd -{:lang="text"} +``` +apt-get install netbsd-inetd +``` One line in `/etc/inetd.conf` reads as the following: - 9999 stream tcp nowait bitlbee /usr/bin/stunnel stunnel -v 0 -l /usr/sbin/bitlbee -{:lang="text"} +``` +9999 stream tcp nowait bitlbee /usr/bin/stunnel stunnel -v 0 -l /usr/sbin/bitlbee +``` This needs to be duplicated and changed to listen on v6, too. - 9999 stream tcp6 nowait bitlbee /usr/bin/stunnel stunnel -v 0 -l /usr/sbin/bitlbee -{:lang="text"} +``` +9999 stream tcp6 nowait bitlbee /usr/bin/stunnel stunnel -v 0 -l /usr/sbin/bitlbee +``` And that's it. +``` /etc/init.d/netbsd-inetd start /etc/init.d/jabberd14 restart -{:lang="text"} +``` and you should be ready to go. diff --git a/_posts/2011-12-25-network-config-without-ifconfig.md b/_posts/2011-12-25-network-config-without-ifconfig.md index 8df2db8..acc2f84 100644 --- a/_posts/2011-12-25-network-config-without-ifconfig.md +++ b/_posts/2011-12-25-network-config-without-ifconfig.md @@ -14,35 +14,37 @@ But is just to much overhead if I just need one command. So I took half an hour Or read here: - # original: http://tridex.net/2011-06-19/linux-netzwerke-ohne-ifconfig/ - # text version by @badboy_ (fnordig.de) +``` +# original: http://tridex.net/2011-06-19/linux-netzwerke-ohne-ifconfig/ +# text version by @badboy_ (fnordig.de) - | Alte Syntax | Neue Syntax | Erklärung | - +-----------------------------+------------------------------+---------------------------------------------+ - | ifconfig eth0 up | ip link set eth0 up | Aktivieren der Netzwerkschnittstelle eth0 | - | ifconfig eth0 down | ip link set eth0 down | Deaktivieren der Netzwerkschnittstelle eth0 | - +-----------------------------+------------------------------+---------------------------------------------+ - | ifconfig eth0 | ip addr show eth0 | Zeigen der IP-Adresse von eth0 | - +-----------------------------+------------------------------+---------------------------------------------+ - | ifconfig -a | ip link | Zeigen aller Netzerkschnittstellen | - +-----------------------------+------------------------------+---------------------------------------------+ - | ifconfig eth0 promisc | ip link set eth0 promisc on | Einschalten des Promisc-Modus | - | ifconfig eth0 -promisc | ip link set eth0 promisc off | Ausschalten des Promisc-Modus | - +-----------------------------+------------------------------+---------------------------------------------+ - | ifconfig eth0 192.168.1.1 | ip addr add 192.168.1.1/24 | IP-Adresse zuweisen | - | netmask 255.255.255.0 | dev eth0 | | - +-----------------------------+------------------------------+---------------------------------------------+ - | route | ip route show | Routen anzeigen | - +-----------------------------+------------------------------+---------------------------------------------+ - | route add default gw | ip route add default | Default-Route hinzufügen | - | 192.168.1.10 | via 192.168.1.10 | | - +-----------------------------+------------------------------+---------------------------------------------+ - | route del default | ip route del default | Default-Route löschen | - +-----------------------------+------------------------------+---------------------------------------------+ - | route add -net 192.168.2.0 | ip route add 192.168.2.0/24 | Netzwerk-Route anlegen | - | netmask 255.255.255.0 | via 192.168.1.100 dev eth0 | | - | gw 192.168.1.100 dev eth0 | | | - +-----------------------------+------------------------------+---------------------------------------------+ - | route del -net 192.168.2.0 | ip route del 192.168.2.0/24 | Netzwerk-Route löschen | - | netmask 255.255.255.0 | via 192.168.1.100 dev eth0 | | - | gw 192.168.1.100 dev eth0 | | | +| Alte Syntax | Neue Syntax | Erklärung | ++-----------------------------+------------------------------+---------------------------------------------+ +| ifconfig eth0 up | ip link set eth0 up | Aktivieren der Netzwerkschnittstelle eth0 | +| ifconfig eth0 down | ip link set eth0 down | Deaktivieren der Netzwerkschnittstelle eth0 | ++-----------------------------+------------------------------+---------------------------------------------+ +| ifconfig eth0 | ip addr show eth0 | Zeigen der IP-Adresse von eth0 | ++-----------------------------+------------------------------+---------------------------------------------+ +| ifconfig -a | ip link | Zeigen aller Netzerkschnittstellen | ++-----------------------------+------------------------------+---------------------------------------------+ +| ifconfig eth0 promisc | ip link set eth0 promisc on | Einschalten des Promisc-Modus | +| ifconfig eth0 -promisc | ip link set eth0 promisc off | Ausschalten des Promisc-Modus | ++-----------------------------+------------------------------+---------------------------------------------+ +| ifconfig eth0 192.168.1.1 | ip addr add 192.168.1.1/24 | IP-Adresse zuweisen | +| netmask 255.255.255.0 | dev eth0 | | ++-----------------------------+------------------------------+---------------------------------------------+ +| route | ip route show | Routen anzeigen | ++-----------------------------+------------------------------+---------------------------------------------+ +| route add default gw | ip route add default | Default-Route hinzufügen | +| 192.168.1.10 | via 192.168.1.10 | | ++-----------------------------+------------------------------+---------------------------------------------+ +| route del default | ip route del default | Default-Route löschen | ++-----------------------------+------------------------------+---------------------------------------------+ +| route add -net 192.168.2.0 | ip route add 192.168.2.0/24 | Netzwerk-Route anlegen | +| netmask 255.255.255.0 | via 192.168.1.100 dev eth0 | | +| gw 192.168.1.100 dev eth0 | | | ++-----------------------------+------------------------------+---------------------------------------------+ +| route del -net 192.168.2.0 | ip route del 192.168.2.0/24 | Netzwerk-Route löschen | +| netmask 255.255.255.0 | via 192.168.1.100 dev eth0 | | +| gw 192.168.1.100 dev eth0 | | | +```