From f2cd78f33d93b1a92dd8a1c41aa0f52d93b29ad2 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jan 2014 03:03:44 +0100 Subject: graph.krebsco.de: mv {,etc/}nginx --- sites/graph.krebsco.de/etc/nginx/sites-available/graph.conf | 11 +++++++++++ .../etc/nginx/sites-available/graph.krebsco.de.conf | 10 ++++++++++ sites/graph.krebsco.de/nginx/sites-available/graph.conf | 11 ----------- .../nginx/sites-available/graph.krebsco.de.conf | 10 ---------- sites/paste/bump | 1 + 5 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 sites/graph.krebsco.de/etc/nginx/sites-available/graph.conf create mode 100644 sites/graph.krebsco.de/etc/nginx/sites-available/graph.krebsco.de.conf delete mode 100644 sites/graph.krebsco.de/nginx/sites-available/graph.conf delete mode 100644 sites/graph.krebsco.de/nginx/sites-available/graph.krebsco.de.conf create mode 160000 sites/paste/bump (limited to 'sites') diff --git a/sites/graph.krebsco.de/etc/nginx/sites-available/graph.conf b/sites/graph.krebsco.de/etc/nginx/sites-available/graph.conf new file mode 100644 index 00000000..1b74f53a --- /dev/null +++ b/sites/graph.krebsco.de/etc/nginx/sites-available/graph.conf @@ -0,0 +1,11 @@ +server { + # graph hosting internal + listen :80; + server_name graph graph.retiolum; # or your hostname + access_log /var/log/nginx/log/graph.log main; + default_type text/plain; + location / { + root /var/www/graph.retiolum; + } +} + diff --git a/sites/graph.krebsco.de/etc/nginx/sites-available/graph.krebsco.de.conf b/sites/graph.krebsco.de/etc/nginx/sites-available/graph.krebsco.de.conf new file mode 100644 index 00000000..0619908e --- /dev/null +++ b/sites/graph.krebsco.de/etc/nginx/sites-available/graph.krebsco.de.conf @@ -0,0 +1,10 @@ +server { + listen :80; + server_name graph.krebsco.de; + access_log /var/log/nginx/log/graph.krebsco.de.access.log main; + default_type text/plain; + location / { + root /var/www/graph.krebsco.de; + } +} + diff --git a/sites/graph.krebsco.de/nginx/sites-available/graph.conf b/sites/graph.krebsco.de/nginx/sites-available/graph.conf deleted file mode 100644 index 1b74f53a..00000000 --- a/sites/graph.krebsco.de/nginx/sites-available/graph.conf +++ /dev/null @@ -1,11 +0,0 @@ -server { - # graph hosting internal - listen :80; - server_name graph graph.retiolum; # or your hostname - access_log /var/log/nginx/log/graph.log main; - default_type text/plain; - location / { - root /var/www/graph.retiolum; - } -} - diff --git a/sites/graph.krebsco.de/nginx/sites-available/graph.krebsco.de.conf b/sites/graph.krebsco.de/nginx/sites-available/graph.krebsco.de.conf deleted file mode 100644 index 0619908e..00000000 --- a/sites/graph.krebsco.de/nginx/sites-available/graph.krebsco.de.conf +++ /dev/null @@ -1,10 +0,0 @@ -server { - listen :80; - server_name graph.krebsco.de; - access_log /var/log/nginx/log/graph.krebsco.de.access.log main; - default_type text/plain; - location / { - root /var/www/graph.krebsco.de; - } -} - diff --git a/sites/paste/bump b/sites/paste/bump new file mode 160000 index 00000000..119d2723 --- /dev/null +++ b/sites/paste/bump @@ -0,0 +1 @@ +Subproject commit 119d2723b510be392ca03d5bca7e1573e533f848 -- cgit v1.2.3 From 1e25ca1c79333ca18c04191b2790d20b17c1a2b6 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jan 2014 03:09:07 +0100 Subject: add paste.retiolum site --- sites/paste.retiolum/README.md | 31 ++++++++++++++++++++++ sites/paste.retiolum/bump | 1 + .../etc/nginx/sites-available/paste.conf | 14 ++++++++++ .../etc/supervisor.d/bump.supervisor.conf | 5 ++++ 4 files changed, 51 insertions(+) create mode 100644 sites/paste.retiolum/README.md create mode 160000 sites/paste.retiolum/bump create mode 100644 sites/paste.retiolum/etc/nginx/sites-available/paste.conf create mode 100644 sites/paste.retiolum/etc/supervisor.d/bump.supervisor.conf (limited to 'sites') diff --git a/sites/paste.retiolum/README.md b/sites/paste.retiolum/README.md new file mode 100644 index 00000000..3c634f95 --- /dev/null +++ b/sites/paste.retiolum/README.md @@ -0,0 +1,31 @@ +# paste.retiolum + +paste is a minimalistic pastebin with sprunge.us in mind. +This paste may be a supplement to all the 'open' pastebins as the punching +lemma applies to this installation. +The installation always runs on a higher port (4000), to get a really short +hostname, the host which provides this service should have a short name as well +and have an nginx or apache which translates all request to hostname:80 to +localhost:4000. see Nginx Configuration. + +# Sources + +- https://github.com/makefu/bump + +# Installation + +## Environment + + git clone https://github.com/makefu/bump + useradd -a bump -m -d /opt/bump + cd /opt/paste + virtualenv . + pip install -r deps.txt + +## Nginx + +see etc/nginx/ + +## Supervisor + +see etc/supervisor.d/ diff --git a/sites/paste.retiolum/bump b/sites/paste.retiolum/bump new file mode 160000 index 00000000..119d2723 --- /dev/null +++ b/sites/paste.retiolum/bump @@ -0,0 +1 @@ +Subproject commit 119d2723b510be392ca03d5bca7e1573e533f848 diff --git a/sites/paste.retiolum/etc/nginx/sites-available/paste.conf b/sites/paste.retiolum/etc/nginx/sites-available/paste.conf new file mode 100644 index 00000000..b83abf95 --- /dev/null +++ b/sites/paste.retiolum/etc/nginx/sites-available/paste.conf @@ -0,0 +1,14 @@ +server { + listen :80; + server_name paste paste.retiolum; + access_log /var/log/nginx/log/paste.log main; + error_log /var/log/nginx/log/paste_error.log; + default_type text/plain; + location / { + proxy_pass http://127.0.0.1:4000/; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +} diff --git a/sites/paste.retiolum/etc/supervisor.d/bump.supervisor.conf b/sites/paste.retiolum/etc/supervisor.d/bump.supervisor.conf new file mode 100644 index 00000000..6b83d5f2 --- /dev/null +++ b/sites/paste.retiolum/etc/supervisor.d/bump.supervisor.conf @@ -0,0 +1,5 @@ +[program:bump] +command=sh run.sh +user=bump +directory=/opt/bump +autorestart=true -- cgit v1.2.3 From cadbb50417dfbab153f31f0fa52b4d7e015692c9 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jan 2014 03:09:24 +0100 Subject: add buildbot.krebsco.de Installation --- sites/buildbot.krebsco.de/INSTALLATION.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sites/buildbot.krebsco.de/INSTALLATION.md (limited to 'sites') diff --git a/sites/buildbot.krebsco.de/INSTALLATION.md b/sites/buildbot.krebsco.de/INSTALLATION.md new file mode 100644 index 00000000..b31a3989 --- /dev/null +++ b/sites/buildbot.krebsco.de/INSTALLATION.md @@ -0,0 +1,17 @@ +#?/bin/sh +# something like this + +useradd ci +punani install python-virtualenv +su ci +virtualenv buildbot +echo ". $HOME/buildbot/bin/activate" >~/.bashrc +pip install buildbot-slave buildbot +buildbot create-master master +# tahoe cp krebs:master.conf master/master.conf +buildbot reconf master +# or reconfigure as many slaves as you wish +buildslave create-slave slave localhost "ubuntu1204-local-slave" +buildbot start master +buildslave start slave +# now make sure that docker is up and working -- cgit v1.2.3 From 057d6c14bf7d5fde80236894af7da66751dd026e Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jan 2014 03:13:28 +0100 Subject: sites: cleanup --- sites/paste/bump | 1 - 1 file changed, 1 deletion(-) delete mode 160000 sites/paste/bump (limited to 'sites') diff --git a/sites/paste/bump b/sites/paste/bump deleted file mode 160000 index 119d2723..00000000 --- a/sites/paste/bump +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 119d2723b510be392ca03d5bca7e1573e533f848 -- cgit v1.2.3 From 1b609ba2b84f9b726e9eaf8cf2aae81c8eecfb99 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jan 2014 03:26:26 +0100 Subject: sites: add tahoe.retiolum --- sites/tahoe.retiolum/README.md | 16 ++++++++++++++++ sites/tahoe.retiolum/conf/tahoe.cfg | 4 ++++ 2 files changed, 20 insertions(+) create mode 100644 sites/tahoe.retiolum/README.md create mode 100644 sites/tahoe.retiolum/conf/tahoe.cfg (limited to 'sites') diff --git a/sites/tahoe.retiolum/README.md b/sites/tahoe.retiolum/README.md new file mode 100644 index 00000000..01e8ed03 --- /dev/null +++ b/sites/tahoe.retiolum/README.md @@ -0,0 +1,16 @@ +# Tahoe in Retiolum +For all the secret stuff, krebsco is using a tahoe installation with 1 +introducer and a number of tahoe bricks. + +# Adding new bricks & clients +see //cholerab/tahoe/{brick,client}\_installation + +# Replacing the introducer +if the introducer may die off, all crypto material is saved in +krebs:tahoe/introducer. There will be a backup somewhere, but bootstrapping +always sucks. + +Follow the generic brick installation, +use the configuration file at conf/tahoe.cfg and copy the crypto material in +the private folder of the installation. +autostart that shit diff --git a/sites/tahoe.retiolum/conf/tahoe.cfg b/sites/tahoe.retiolum/conf/tahoe.cfg new file mode 100644 index 00000000..f70a94da --- /dev/null +++ b/sites/tahoe.retiolum/conf/tahoe.cfg @@ -0,0 +1,4 @@ +[node] +nickname = intro +web.port = +web.static = public_html -- cgit v1.2.3 From 318840c0460c93242b15f66052ae32739a991ba3 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jan 2014 03:33:25 +0100 Subject: sites: add gold.krebsco.de --- sites/gold.krebsco.de/README.md | 18 ++++++++++++++++++ .../etc/nginx/sites-available/gold.krebsco.de | 12 ++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 sites/gold.krebsco.de/README.md create mode 100644 sites/gold.krebsco.de/etc/nginx/sites-available/gold.krebsco.de (limited to 'sites') diff --git a/sites/gold.krebsco.de/README.md b/sites/gold.krebsco.de/README.md new file mode 100644 index 00000000..6839631a --- /dev/null +++ b/sites/gold.krebsco.de/README.md @@ -0,0 +1,18 @@ +# gold +gold.krebsco.de is a simple file share which provides plugins for +firefox/chromium to rewrite referers. + +# Installation: +copy the nginx config at etc/nginx/sites-available, edit before use + +# Plugins +All krebsgold plugins are stored in /krebs/gold/affiliate/ +For installation follow the instruction at /krebs/gold/affiliate/README.md + +## Chromium +uses userscripts, a modified version of the fsf amazon userscript + +## Affiliatefox +Affiliatefox is a dodgy plugin by some weird german dudes at +http://www.the-angelz.net . it may be removed in the future as the chromium +userscript also works for firefox+greasemonkey diff --git a/sites/gold.krebsco.de/etc/nginx/sites-available/gold.krebsco.de b/sites/gold.krebsco.de/etc/nginx/sites-available/gold.krebsco.de new file mode 100644 index 00000000..1c565bbd --- /dev/null +++ b/sites/gold.krebsco.de/etc/nginx/sites-available/gold.krebsco.de @@ -0,0 +1,12 @@ +server { + listen :80; + server_name gold.krebsco.de; + access_log /var/log/nginx/log/gold.krebsco.log main; + default_type text/plain; + autoindex on; + location / { + # path to //gold/affiliate/ ,may be a symlink or something + root /var/www/gold.krebsco.de; + } +} + -- cgit v1.2.3 From da8f0952253b7463ec1951dcdee0127fe7782c88 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jan 2014 03:43:08 +0100 Subject: add tinc.krebsco.de --- sites/tinc.krebsco.de/README.md | 11 +++++++++++ .../etc/nginx/sites-available/tinc.krebsco.de.conf | 10 ++++++++++ 2 files changed, 21 insertions(+) create mode 100644 sites/tinc.krebsco.de/README.md create mode 100644 sites/tinc.krebsco.de/etc/nginx/sites-available/tinc.krebsco.de.conf (limited to 'sites') diff --git a/sites/tinc.krebsco.de/README.md b/sites/tinc.krebsco.de/README.md new file mode 100644 index 00000000..3d3d2faa --- /dev/null +++ b/sites/tinc.krebsco.de/README.md @@ -0,0 +1,11 @@ +# tinc.krebsco.de +tinc.krebsco.de is a curl | sh tinc bootstrapper. For more information see +//retiolum/scripts/tinc_setup/README. + +The nginx is pointed to the folder //boot in painload. + +In order to avoid adding an addition file name a special nginx configuration +based on the try_files directive. + +# Installation +See etc/nginx/sites-available/tinc.krebsco.de.conf diff --git a/sites/tinc.krebsco.de/etc/nginx/sites-available/tinc.krebsco.de.conf b/sites/tinc.krebsco.de/etc/nginx/sites-available/tinc.krebsco.de.conf new file mode 100644 index 00000000..15749985 --- /dev/null +++ b/sites/tinc.krebsco.de/etc/nginx/sites-available/tinc.krebsco.de.conf @@ -0,0 +1,10 @@ +server { + listen :80; + server_name tinc.krebsco.de; + access_log /var/log/nginx/log/boot.krebsco.log main; + default_type text/plain; + # this path should be //boot + root /var/www/boot.krebsco.de; + try_files $uri $uri/retiolum.sh ; +} + -- cgit v1.2.3