Commit graph

38 commits

Author SHA1 Message Date
Eelco Dolstra 5685ee5446 Add/fix systemd unit descriptions 2013-01-10 13:59:41 +01:00
Eelco Dolstra ae861c8e33 Undo accidental commit 2012-10-29 12:44:38 +01:00
Eelco Dolstra d7458b5fc2 Split the monolithic network-interface service into multiple units
For each statically configured interface, we now create a unit
‘<interface>-cfg.service’ which gets started as soon as the network
device comes up.  Similarly, each bridge defined in
‘networking.bridges’ and virtual interface in ‘networking.interfaces’
is created by a service ‘<interface>.service’.

So if we have

  networking.bridges.br0.interfaces = [ "eth0" "eth1" ];
  networking.interfaces =
    [ { name = "br0";
        ipAddress = "192.168.1.1";
      }
    ];

then there will be a unit ‘br0.service’ that depends on
‘sys-subsystem-net-devices-eth0.device’ and
‘sys-subsystem-net-devices-eth1.device’, and a unit ‘br0-cfg.service’
that depends on ‘sys-subsystem-net-devices-br0.device’.
2012-10-10 17:55:42 -04:00
Eelco Dolstra 9b014c471a * CUPS: fix printing on a Ricoh Aficio MP C4500 PXL printer (and
probably lots of others).  The $PATH used to invoke the filter
  didn't contain Ghostscript and Perl, so it silently fails.  (A nice
  property of CUPS is that it will just silently discard the job when
  that happens, so you need to set LogLevel to "debug" to see this.)
  Fortunately, CUPS now has a "SetEnv" option to set $PATH explicitly.

  Also, remove config.system.path from the PATH of CUPS' Upstart job.
  It seems to serve no purpose.

svn path=/nixos/trunk/; revision=34244
2012-05-25 15:51:33 +00:00
Eelco Dolstra 573877c1ac * Use boot.kernelModules everywhere instead of explicit calls to
modprobe.
* Move the implementation of boot.kernelModules from the udev job to
  the activation script.  This prevents races with the udev job.
* Drop references to the "capability" kernel module, which no longer
  exists.

svn path=/nixos/trunk/; revision=33208
2012-03-17 17:26:17 +00:00
Peter Simons 8708578181 services/printing/cupsd.nix: move the gstoraster.convs file from /etc/cups into the compiled backends directory in the store
svn path=/nixos/trunk/; revision=32951
2012-03-09 10:24:31 +00:00
Peter Simons 036e585b42 modules/services/printing/cupsd.nix: tell cups to use 'gstoraster' instead of 'pstoraster'
The CUPS filter has been renamed in GNU Ghostscript 9.x. Fortunately,
Ghostscript ships with a MIME conversions file that informs CUPS about this,
so linking that file into /etc/cups works fine. I'm not sure whether it's a
particularly elegant solution, though.

svn path=/nixos/trunk/; revision=31489
2012-01-11 23:17:36 +00:00
Peter Simons 70850268e0 Revert "modules/services/printing/cupsd.nix: fixed path to DataDir"
This reverts commit 2a1ce489154c8543bc146a7d99e1a397eb920e1f.

svn path=/nixos/trunk/; revision=31484
2012-01-11 20:48:40 +00:00
Peter Simons 6385d51f7e modules/services/printing/cupsd.nix: fixed path to DataDir
svn path=/nixos/trunk/; revision=31457
2012-01-09 16:03:43 +00:00
Eelco Dolstra 8eba736da9 * Use the ‘path’ attribute in Upstart jobs in more places. It's a bit
more readable (also in "ps" output).

svn path=/nixos/trunk/; revision=30565
2011-11-25 16:32:54 +00:00
Peter Simons 84a37365c2 modules/services/printing/cupsd.nix: ensure that /etc/cups exists before the daemon is run
CUPS is really unhappy when /etc/cups doesn't exist, and without that
directory it's going to mess up file permissions of /nix/store, the web
front-end won't work, and probably all kinds of other stuff is broken
that I didn't notice yet. :-(

svn path=/nixos/trunk/; revision=29452
2011-09-23 14:41:22 +00:00
David Guibert 7d982fd1bd cups: fix smb backend
svn path=/nixos/trunk/; revision=29393
2011-09-20 07:14:27 +00:00
Peter Simons eb6e1310b8 strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
2011-09-14 18:20:50 +00:00
Peter Simons f5e8d35f8e modules/services/printing/cupsd.nix: /etc/cups/mime.{convs,types} are obsolete
Current versions of CUPS (1.4.7 or later, apparently) load these files
from ${cups}/share/mime, so we no longer need the symlinks in /etc.

svn path=/nixos/trunk/; revision=29284
2011-09-14 18:20:13 +00:00
Russell O'Connor 1744733be8 Revering CUPS update.
svn path=/nixos/trunk/; revision=29283
2011-09-14 17:58:57 +00:00
Peter Simons 02bb4eb289 modules/services/printing/cupsd.nix: MIME related config files have moved to share in cups 1.5
svn path=/nixos/trunk/; revision=29254
2011-09-13 20:42:21 +00:00
Eelco Dolstra 6719446d4b * Some hackery to get foomatic-filters to work.
svn path=/nixos/trunk/; revision=27471
2011-06-15 12:41:15 +00:00
Eelco Dolstra c2a3aa8e79 * Open UDP port 631 in the firewall to allow CUPS to discover
printers on the network.

svn path=/nixos/trunk/; revision=27399
2011-06-08 15:55:51 +00:00
Yury G. Kudryashov aaf3247e80 Add cups_pdf_filter to default drivers list
svn path=/nixos/trunk/; revision=25153
2010-12-15 22:36:54 +00:00
Yury G. Kudryashov bedc715ecd Be more verbose
svn path=/nixos/trunk/; revision=25152
2010-12-15 22:36:39 +00:00
Yury G. Kudryashov 1319531f28 Add system.path to PATH instead of overriding
svn path=/nixos/trunk/; revision=23879
2010-09-21 09:16:47 +00:00
Eelco Dolstra ea49707f85 * Run CUPS' external programs in the "lp" group so that they can
access printer devices in /dev.  Also use a "cups" user instead of
  "nobody".

svn path=/nixos/trunk/; revision=23003
2010-08-06 14:52:09 +00:00
Lluís Batlle i Rossell dadd6d63e7 oops. Fixing the cupsd path. How to set a single path there in the job? I don't know.
svn path=/nixos/trunk/; revision=22174
2010-06-07 21:44:06 +00:00
Lluís Batlle i Rossell 9e275ffa58 Trying to improve the cups expression a bit, so it can print also with local usb printers.
(Thank you Oleksandr)


svn path=/nixos/trunk/; revision=22173
2010-06-07 21:09:27 +00:00
Eelco Dolstra 1133f664bd * Fix https printing (the symlink to ipp was broken).
svn path=/nixos/trunk/; revision=21841
2010-05-18 15:19:52 +00:00
Yury G. Kudryashov 226a9c8bbb Update CUPS module
* Create symlinks in cups-progs only if they aren't already here
* add tmpDir option

svn path=/nixos/trunk/; revision=21309
2010-04-25 18:27:00 +00:00
Lluís Batlle i Rossell a008d6b391 Fixing the cups-progs build problems, for the cupsd module. It wrote over other
store paths.


svn path=/nixos/trunk/; revision=21161
2010-04-19 10:54:39 +00:00
Yury G. Kudryashov a26d31d04c Add support for custom CUPS drivers
Use buildEnv for cups-prog.

svn path=/nixos/trunk/; revision=21102
2010-04-15 15:47:07 +00:00
Eelco Dolstra 6c710f7d2b * Provide an example for services.printing.cupsdConf.
* Change the default CUPS log level to "info".

svn path=/nixos/trunk/; revision=20957
2010-04-06 13:25:00 +00:00
Eelco Dolstra 755ee8bd08 * Add a configuration option `services.printing.cupsdConf' to allow
appending verbatim text to the CUPS daemon configuration file.
* cupsd.conf: set ErrorLog properly.

svn path=/nixos/trunk/; revision=20954
2010-04-06 11:57:15 +00:00
Eelco Dolstra 83a9bf9a6a * Change all the startOn / stopOn attributes to the Upstart 0.6 syntax
(e.g., startOn = "started foo" instead of startOn = "foo").

svn path=/nixos/branches/upstart-0.6/; revision=18230
2009-11-06 22:19:17 +00:00
Eelco Dolstra 3f7eb694a9 * CUPS provides a dbus service.
svn path=/nixos/trunk/; revision=18125
2009-11-04 22:44:21 +00:00
Eelco Dolstra eba8f94069 * jobAttrs -> jobs.
svn path=/nixos/trunk/; revision=17769
2009-10-12 18:09:34 +00:00
Eelco Dolstra e91d882a94 * Converted modules that were still using the old (concrete syntax)
style of declaring Upstart jobs.  While at it, converted them to the
  current NixOS module style and improved some option descriptions.
  Hopefully I didn't break too much :-)

svn path=/nixos/trunk/; revision=17761
2009-10-12 16:36:19 +00:00
Marc Weber 39e12e13c4 cupsd: add bindirCmds so that you can test other backends easier.
svn path=/nixos/trunk/; revision=16879
2009-08-27 23:16:09 +00:00
Eelco Dolstra 118418ba31 * Refactoring the Upstart module. Got rid of job.extraEtc, it's
redundant now (modules can just define environment.etc).

svn path=/nixos/branches/modular-nixos/; revision=16367
2009-07-15 09:06:36 +00:00
Eelco Dolstra 6e066c8e1d * Idem.
svn path=/nixos/branches/modular-nixos/; revision=15724
2009-05-25 13:55:36 +00:00
Eelco Dolstra 5ebdee3577 * Continued refactoring the tree: moved most Upstart jobs (namely
those that run daemons) to modules/services.  This probably broke
  some things since there are a few relative paths in modules
  (e.g. imports of system/ids.nix).
* Moved some PAM modules out of etc/pam.d to the directories of NixOS
  modules that use them.

svn path=/nixos/branches/modular-nixos/; revision=15717
2009-05-24 23:13:23 +00:00