Merge remote-tracking branch 'gum/master'

2 files changed, 44 insertions, 3 deletions

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")
           '
         }
       }