From 7e1bd2729e11e5c63749c69093359de0bb3329b2 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 22 Jan 2017 23:41:35 +0100 Subject: m omo: remove shared printer again (just for reference) --- makefu/1systems/omo.nix | 6 ++++-- makefu/2configs/printer-shared.nix | 38 -------------------------------------- 2 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 makefu/2configs/printer-shared.nix (limited to 'makefu') diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix index 5241b0b8e..422fe7c48 100644 --- a/makefu/1systems/omo.nix +++ b/makefu/1systems/omo.nix @@ -53,17 +53,19 @@ in { #../2configs/share-user-sftp.nix ../2configs/omo-share.nix ../2configs/tinc/retiolum.nix + ../2configs/logging/central-stats-server.nix + ../2configs/logging/central-stats-client.nix # ../2configs/torrent.nix # ../2configs/elchos/search.nix # ../2configs/elchos/log.nix # ../2configs/elchos/irc-token.nix - ../2configs/printer-shared.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 ]; makefu.full-populate = true; + makefu.server.primary-itf = primaryInterface; krebs.rtorrent = { downloadDir = lib.mkForce "/media/crypt0/torrent"; extraConfig = '' @@ -112,7 +114,7 @@ in { (d: "install -m 755 -d " + (toMapper d) ) [ 0 1 2 "X" ]} ''; - environment.systemPackages = with pkgs;[ + environment.systemPackages = with pkgs;[ mergerfs # hard requirement for mount wol # wake up filepimp f3 diff --git a/makefu/2configs/printer-shared.nix b/makefu/2configs/printer-shared.nix deleted file mode 100644 index 2a9e6724d..000000000 --- a/makefu/2configs/printer-shared.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ pkgs, config, ... }: - -{ - nixpkgs.config.allowUnfree = true; - services.avahi.enable = true; - services.avahi.publish.enable = true; - services.avahi.publish.userServices = true; - services.avahi.interfaces = [ config.makefu.server.primary-itf ]; - services.avahi.ipv6 = false; - services.avahi.nssmdns = true; - # via https://github.com/tjfontaine/airprint-generate/ - # environment.etc."avahi/services/samsung_scx2300.service".text - nixpkgs.config.packageOverrides = pkgs: rec { - avahi = pkgs.stdenv.lib.overrideDerivation pkgs.avahi (oldAttrs: { - postFixup = let - cfg = pkgs.writeText "airprint-scx3200.service" ''AirPrint Samsung_SCX-3200_Series @ %h_ipp._tcp_universal._sub._ipp._tcp631txtvers=1qtotal=1Transparent=TURF=nonerp=printers/Samsung_SCX-3200_Seriesnote=Samsung SCX-3200 Seriesproduct=(GPL Ghostscript)printer-state=3printer-type=0x801044pdl=application/octet-stream,application/pdf,application/postscript,application/vnd.cups-raster,image/gif,image/jpeg,image/png,image/tiff,image/urf,text/html,text/plain,application/vnd.adobe-reader-postscript,application/vnd.cups-command''; - in '' - cp ${cfg} $out/etc/avahi/services/airprint-scx3200.service - ''; - }); - }; - - # only allowed in local network - services.printing = { - enable = true; - browsing = true; - #avahiEnabled = true; - defaultShared = true; - listenAddresses = [ "*:631" ]; - drivers = [ - pkgs.samsungUnifiedLinuxDriver - ]; - }; - - # scanners are printers just in reverse anyway - hardware.sane.enable = true; - hardware.sane.extraBackends = [ pkgs.samsungUnifiedLinuxDriver ]; -} -- cgit v1.2.3