diff options
| author | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-01-14 14:46:22 +0100 |
| commit | dbe2d838ba6834788265029162b2dd7d82473335 (patch) | |
| tree | a4eb38f7fc91d91269b6f83453de62242c6ddc23 /boot | |
| parent | 5a782f6c8f7923f9f415afd504ce6e71acbc7fef (diff) | |
| parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Conflicts:
god/temper/Makefile
god/temper/collectd-temper.sh
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/lighttpd.conf | 12 | ||||
| l--------- | boot/painload.sh | 1 | ||||
| l--------- | boot/retiolum.sh | 1 |
3 files changed, 14 insertions, 0 deletions
diff --git a/boot/lighttpd.conf b/boot/lighttpd.conf new file mode 100644 index 00000000..e8d621aa --- /dev/null +++ b/boot/lighttpd.conf @@ -0,0 +1,12 @@ +$HTTP["host"] =~ "(^|\.)boot\.krebsco\.de$" { + server.document-root = "/krebs/boot" + server.errorlog = "/var/log/lighttpd/boot.krebsco.de/error.log" + accesslog.filename = "/var/log/lighttpd/boot.krebsco.de/access.log" + url.rewrite-if-not-file = ( ".*" => "/bootstrap.sh" ) +} +$HTTP["host"] =~ "(^|\.)tinc\.krebsco\.de$" { + server.document-root = "/krebs/boot" + server.errorlog = "/var/log/lighttpd/boot.krebsco.de/error.log" + accesslog.filename = "/var/log/lighttpd/boot.krebsco.de/access.log" + url.rewrite-if-not-file = ( ".*" => "/retiolum.sh" ) +} diff --git a/boot/painload.sh b/boot/painload.sh new file mode 120000 index 00000000..1ee91d92 --- /dev/null +++ b/boot/painload.sh @@ -0,0 +1 @@ +../infest/bootstrap.sh
\ No newline at end of file diff --git a/boot/retiolum.sh b/boot/retiolum.sh new file mode 120000 index 00000000..69425ea9 --- /dev/null +++ b/boot/retiolum.sh @@ -0,0 +1 @@ +../retiolum/scripts/tinc_setup/new_install.sh
\ No newline at end of file |