summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-04-30 19:54:09 +0200
committerlassulus <lass@lassul.us>2017-04-30 19:54:09 +0200
commit4cc5b5c1049d70c4829776743b8960c0399d2b07 (patch)
tree146585087d1d45d3d738333897808757ab00db82
parentc2c5b04f9daf97d1b6daffd906dde2e0c205cf95 (diff)
parent9ee75566e5ca1a9ef01ab9509ca80ca49c8110d4 (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--krebs/3modules/makefu/default.nix6
-rw-r--r--makefu/1systems/gum.nix6
-rw-r--r--makefu/2configs/deployment/boot-euer.nix28
-rw-r--r--makefu/2configs/deployment/wiki-irc.nix19
-rw-r--r--makefu/2configs/qemu-guest.nix4
5 files changed, 56 insertions, 7 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 6b32fc38a..651b9a3c6 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -433,15 +433,17 @@ with import <stockholm/lib>;
"krebsco.de" = ''
share.euer IN A ${nets.internet.ip4.addr}
mattermost.euer IN A ${nets.internet.ip4.addr}
- git.euer IN A ${nets.internet.ip4.addr}
gum IN A ${nets.internet.ip4.addr}
pigstarter IN A ${nets.internet.ip4.addr}
cgit.euer IN A ${nets.internet.ip4.addr}
+ euer IN A ${nets.internet.ip4.addr}
o.euer IN A ${nets.internet.ip4.addr}
+ git.euer IN A ${nets.internet.ip4.addr}
dl.euer IN A ${nets.internet.ip4.addr}
- euer IN A ${nets.internet.ip4.addr}
+ boot.euer IN A ${nets.internet.ip4.addr}
wiki.euer IN A ${nets.internet.ip4.addr}
graph IN A ${nets.internet.ip4.addr}
+ ghook IN A ${nets.internet.ip4.addr}
'';
};
nets = rec {
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index 4850aedc1..95d092822 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -26,16 +26,18 @@ in {
../2configs/iodined.nix
## Web
- ../2configs/deployment/owncloud.nix
- ../2configs/deployment/newsbot.nix
../2configs/nginx/share-download.nix
../2configs/nginx/euer.test.nix
../2configs/nginx/euer.wiki.nix
../2configs/nginx/euer.blog.nix
../2configs/nginx/public_html.nix
../2configs/nginx/update.connector.one.nix
+
../2configs/deployment/mycube.connector.one.nix
../2configs/deployment/graphs.nix
+ ../2configs/deployment/owncloud.nix
+ ../2configs/deployment/wiki-irc.nix
+ ../2configs/deployment/boot-euer.nix
# ../2configs/ipfs.nix
../2configs/syncthing.nix
diff --git a/makefu/2configs/deployment/boot-euer.nix b/makefu/2configs/deployment/boot-euer.nix
new file mode 100644
index 000000000..be24209bc
--- /dev/null
+++ b/makefu/2configs/deployment/boot-euer.nix
@@ -0,0 +1,28 @@
+{ config, lib, pkgs, ... }:
+# more than just nginx config but not enough to become a module
+with import <stockholm/lib>;
+let
+ hostname = config.krebs.build.host.name;
+ bootscript = pkgs.writeTextDir "runit" ''
+ set -euf
+ cd /root
+ mkdir -p .ssh
+ echo "${config.krebs.users.makefu.pubkey}" > .ssh/authorized_keys
+ chmod 700 -R .ssh
+ systemctl restart sshd
+ '';
+in {
+
+ services.nginx = {
+ enable = mkDefault true;
+ virtualHosts."boot.euer.krebsco.de" = {
+ enableSSL = true;
+ forceSSL = true;
+ enableACME = true;
+ locations."/" = {
+ root = bootscript;
+ index = "runit";
+ };
+ };
+ };
+}
diff --git a/makefu/2configs/deployment/wiki-irc.nix b/makefu/2configs/deployment/wiki-irc.nix
index 73b85d821..a7527f796 100644
--- a/makefu/2configs/deployment/wiki-irc.nix
+++ b/makefu/2configs/deployment/wiki-irc.nix
@@ -16,9 +16,22 @@ in {
if ([pages]) {
ruby {
code => '
- o = ""
- event["pages"].each { |p| o = o + "\"" + p["title"] + "\" " + p["action"] +" by "+ event["sender"]["login"]+" " +p["html_url"] + "/_compare/" + p["sha"] + "\n" }
- event["output"] = o
+ require "net/http"
+ require "net/https"
+ http = Net::HTTP.new("git.io", 443)
+ http.use_ssl = true
+ lines = []
+ event["pages"].each {|p|
+ url = "#{p["html_url"]}/_compare/#{p["sha"]}"
+ short_url = begin
+ request = Net::HTTP::Post.new "/"
+ request.set_form_data ({"url" => url })
+ response = http.request(request)
+ response["location"]
+ end
+ lines << "\"#{p["title"]}\" #{p["action"]} by #{event["sender"]["login"]} #{short_url}"
+ }
+ event["output"] = lines.join("\n")
'
}
}
diff --git a/makefu/2configs/qemu-guest.nix b/makefu/2configs/qemu-guest.nix
new file mode 100644
index 000000000..43ec84ed5
--- /dev/null
+++ b/makefu/2configs/qemu-guest.nix
@@ -0,0 +1,4 @@
+{...}:
+{
+ boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk" "virtio_net" "virtio_scsi" ];
+}