Merge branch 'master' of pnp:stockholm

This commit is contained in:
makefu 2015-11-18 14:11:22 +01:00
commit 8bff399f0d

View File

@ -1,6 +1,30 @@
{ pkgs, lib, ... }:
{ pkgs, lib, config, ... }:
let
repodir = "/var/srv/drivedroid";
srepodir = lib.shell.escape repodir;
in
{
systemd.paths.drivedroid = {
wantedBy = [ "multi-user.target" ];
Description = "triggers for changes in drivedroid dir";
pathConfig = {
PathModified = repodir;
};
};
systemd.services.drivedroid = {
ServiceConfig = {
ExecStartPre = pkgs.writeScript "prepare-drivedroid-repo-gen" ''
#!/bin/sh
mkdir -p ${srepodir}/repos
'';
ExecStart = pkgs.writeScript "start-drivedroid-repo-gen" ''
#!/bin/sh
{pkgs.drivedroid-gen-repo}/bin/drivedroid-gen-repo --chdir "${srepodir}" repos/ > "${srepodir}/main.json"
'';
};
};
krebs.nginx = {
enable = lib.mkDefault true;
servers = {
@ -8,7 +32,7 @@
server-names = [ "drivedroid.shack" ];
# TODO: prepare this somehow
locations = lib.singleton (lib.nameValuePair "/" ''
root /var/srv/drivedroid;
root ${repodir};
index main.json;
'');
};