summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2020-11-12 10:28:14 +0100
committermakefu <github@syntax-fehler.de>2020-11-16 21:22:02 +0100
commit5e6f56889580d4e2924491a7f471d7994b35212f (patch)
tree1bcf4d164efd15f8fcc50faf9238ba77c8b79067
parent430dad522cfc6d19329c323e009f47dc0cdc9250 (diff)
puyak,wolf: add documentation for imports
update share
-rw-r--r--krebs/1systems/puyak/config.nix20
-rw-r--r--krebs/1systems/wolf/config.nix4
-rw-r--r--krebs/2configs/shack/share.nix3
3 files changed, 18 insertions, 9 deletions
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index 3357964ef..0cadc3a10 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -27,20 +27,24 @@
# drivedroid.shack for shackphone
<stockholm/krebs/2configs/shack/drivedroid.nix>
# <stockholm/krebs/2configs/shack/nix-cacher.nix>
+
# Say if muell will be collected
<stockholm/krebs/2configs/shack/muell_caller.nix>
- # provide muellshack api
+ # provide muellshack api: muell.shack
<stockholm/krebs/2configs/shack/muellshack.nix>
- # provide light control api
- <stockholm/krebs/2configs/shack/node-light.nix>
- # light.shack web-ui
- <stockholm/krebs/2configs/shack/light.shack.nix>
# send mail if muell was not handled
<stockholm/krebs/2configs/shack/muell_mail.nix>
- # send mail if muell was not handled
- <stockholm/krebs/2configs/shack/s3-power.nix>
+
+ # provide light control api
+ <stockholm/krebs/2configs/shack/node-light.nix> # light.shack lounge.light.shack power.light.shack openhab.shack lightapi.shack
+ # light.shack web-ui
+ <stockholm/krebs/2configs/shack/light.shack.nix> #light.shack
+
# powerraw usb serial to mqtt and raw socket
- <stockholm/krebs/2configs/shack/powerraw.nix>
+ <stockholm/krebs/2configs/shack/powerraw.nix> # powerraw.shack standby.shack
+ # send power stats to s3
+ <stockholm/krebs/2configs/shack/s3-power.nix> # powerraw.shack must be available
+
{ # do not log to /var/spool/log
services.nginx.appendHttpConfig = ''
diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix
index 0c95f4d13..25e7c5f06 100644
--- a/krebs/1systems/wolf/config.nix
+++ b/krebs/1systems/wolf/config.nix
@@ -15,8 +15,10 @@ in
<stockholm/krebs/2configs/binary-cache/prism.nix>
#### shackspace services
- <stockholm/krebs/2configs/shack/share.nix>
+ <stockholm/krebs/2configs/shack/share.nix> # wolf.shack
+ # gitlab runner
+ <stockholm/krebs/2configs/shack/gitlab-runner.nix>
# misc
<stockholm/krebs/2configs/shack/ssh-keys.nix>
<stockholm/krebs/2configs/save-diskspace.nix>
diff --git a/krebs/2configs/shack/share.nix b/krebs/2configs/shack/share.nix
index 465d6ef69..d8d65d309 100644
--- a/krebs/2configs/shack/share.nix
+++ b/krebs/2configs/shack/share.nix
@@ -37,6 +37,9 @@
# for legacy systems
client min protocol = NT1
server min protocol = NT1
+ workgroup = WORKGROUP
+ server string = ${config.networking.hostName}
+ netbios name = ${config.networking.hostName}
'';
};
}