diff options
| author | lassulus <lass@lassul.us> | 2016-12-25 12:13:49 +0100 |
|---|---|---|
| committer | lassulus <lass@lassul.us> | 2016-12-25 12:13:49 +0100 |
| commit | 9224478adf54f7f65c7e8565c846160b2f0ea467 (patch) | |
| tree | ca477dd5d011581da0b3796f30c842c9fdddf214 /makefu/1systems/omo.nix | |
| parent | 8f16b738c75f25738ca94f146d84c5cc5ec7eaa3 (diff) | |
| parent | 1eceb8ac46fd1cebbb5091a50359e4863efdaf42 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/omo.nix')
| -rw-r--r-- | makefu/1systems/omo.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index 4fbbd653d..609d52134 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -48,12 +48,16 @@ in { ../2configs/exim-retiolum.nix ../2configs/smart-monitor.nix ../2configs/mail-client.nix - ../2configs/disable_v6.nix + # ../2configs/disable_v6.nix #../2configs/graphite-standalone.nix #../2configs/share-user-sftp.nix ../2configs/omo-share.nix ../2configs/tinc/retiolum.nix - ../2configs/torrent.nix + # ../2configs/torrent.nix + + # ../2configs/elchos/search.nix + # ../2configs/elchos/log.nix + # ../2configs/elchos/irc-token.nix ## as long as pyload is not in nixpkgs: # docker run -d -v /var/lib/pyload:/opt/pyload/pyload-config -v /media/crypt0/pyload:/opt/pyload/Downloads --name pyload --restart=always -p 8112:8000 -P writl/pyload @@ -121,7 +125,8 @@ in { // { "/media/cryptX" = { device = (lib.concatMapStringsSep ":" (d: (toMapper d)) [ 0 1 2 ]); fsType = "mergerfs"; - options = [ "defaults" "allow_other" ]; + noCheck = true; + options = [ "defaults" "allow_other" "nofail" "nonempty" ]; }; }; |