dms and light-control update

This commit is contained in:
Ingolf Wagner 2020-07-11 18:04:05 +02:00
parent bda59e538e
commit d1a9626cb7
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
3 changed files with 9 additions and 5 deletions

View file

@ -8,8 +8,8 @@
let let
dms = pkgs.fetchgit { dms = pkgs.fetchgit {
url = "https://github.com/mrVanDalo/dms.git"; url = "https://github.com/mrVanDalo/dms.git";
rev = "23308490c99eb2ca4a4936e6c4e87403137d9ac1"; rev = "187aee5418906aa4a3fee220fba74249fc05e794";
sha256 = "1gzxlqni9ybmbj8ip2cbkbld3nid3x7552f8v8868nzw1crqky3b"; sha256 = "0j46mg6r1ygxs41ql1c7pvkgwjgdii5kbd3whpf29spm61k0lja5";
}; };
in { in {
@ -57,6 +57,7 @@ in {
pkgs.which pkgs.which
pkgs.netpbm pkgs.netpbm
pkgs.gawk pkgs.gawk
pkgs.bash
]; ];
serviceConfig = { User = "ftp-upload"; }; serviceConfig = { User = "ftp-upload"; };
preStart = '' preStart = ''
@ -81,7 +82,7 @@ in {
enable = true; enable = true;
virtualHosts = { virtualHosts = {
"dms.pepe.private" = { "dms.pepe.private" = {
serverAliases = [ "pdf.pepe.private" "docs.pepe.private" ]; serverAliases = [ "pdf.pepe.private" "docs.pepe.private" "dms.pepe.lan" ];
locations."/" = { proxyPass = "http://localhost:5000"; }; locations."/" = { proxyPass = "http://localhost:5000"; };
}; };
}; };

View file

@ -30,6 +30,9 @@
"stat/PAL08/RESULT" "stat/PAL08/RESULT"
"zigbee2mqtt/light_2" "zigbee2mqtt/light_2"
]; ];
ignored_switches = [
"zigbee2mqtt/motion_sensor_7"
];
} }
]; ];
sensors = let sensors = let

View file

@ -5,8 +5,8 @@ rustPlatform.buildRustPackage rec {
version = "0.1.0"; version = "0.1.0";
src = fetchgit { src = fetchgit {
url = "https://git.ingolf-wagner.de/palo/light-control.git"; url = "https://git.ingolf-wagner.de/palo/light-control.git";
rev = "0b5034e2d2cb4bdf1dc0bd7fd9c483ef0141e77a"; rev = "dca0a41dde71b98859a82be8dd84ab59a56c39ed";
sha256 = "06jr6bndk75c4f73mn0gfbb67z70anlm7lqib4dd8rbxpfd24ldl"; sha256 = "0khlw2slg9cwcwks5hz22bk1whkv4hn3vgd2kwi6glc3b605m96b";
}; };
cargoSha256 = "1yzkbj36sx4vc8dsgcxahrvn33ci2ad1cpd1shcismw33k63rimh"; cargoSha256 = "1yzkbj36sx4vc8dsgcxahrvn33ci2ad1cpd1shcismw33k63rimh";