Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2017-04-30 19:54:09 +02:00
commit 4cc5b5c104
5 changed files with 57 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
krebs/3modules/makefu/default.nix
View File

@ -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}
o.euer IN A ${nets.internet.ip4.addr}
dl.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}
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 {

6
makefu/1systems/gum.nix
View File

@ -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

28
makefu/2configs/deployment/boot-euer.nix Normal file
View File

@ -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";
};
};
};
}

19
makefu/2configs/deployment/wiki-irc.nix
View File

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

4
makefu/2configs/qemu-guest.nix Normal file
View File

@ -0,0 +1,4 @@
{...}:
{
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "ehci_pci" "virtio_pci" "virtio_blk" "virtio_net" "virtio_scsi" ];
}