1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-16 09:53:17 +00:00
Commit graph

4686 commits

Author SHA1 Message Date
Eelco Dolstra 8af81ad66b Don't start nscd if it's not already running
"systemctl restart" will start a service if it's not already
running...
2013-05-07 14:22:35 +02:00
Eelco Dolstra e62c0d2e1f Manual: _SYSTEMD_UNIT -> -u 2013-05-07 14:22:35 +02:00
Evgeny Egorochkin dc389c5d1e lighttpd: add gitweb as a sub-service
Now you can access gitweb at http://yourserver/gitweb by simply adding
this to configuration.nix (assuming services.lighttpd.enable = true);

  services.lighttpd.gitweb.enable = true;

The path to all bare repositories served by gitweb can be set with this
option (default value below):

  services.lighttpd.gitweb.projectroot = "/srv/git";

Based on patch contributed by Bjørn Forsman.
2013-05-06 13:51:09 +03:00
Evgeny Egorochkin 161086b205 lighttpd: add services.lighttpd.mod_status option
If true, show server status overview at /server-status, statistics at
/server-statistics and list of loaded modules at /server-config.

Patch contributed by Bjørn Forsman.
2013-05-06 13:51:09 +03:00
Evgeny Egorochkin 4b435b173f lighttpd: add services.lighttpd.mod_userdir option
If true, requests in the form /~user/page.html are rewritten to take
the file public_html/page.html from the home directory of the user.

Default is off.

Patch contributed by Bjørn Forsman.
2013-05-06 13:51:08 +03:00
Evgeny Egorochkin 5e32c9c8eb lighttpd: generate a default config file
Instead of forcing users to configure lighttpd manually, make it an
option. The current services.lighttpd.configText option can still be
used for manual configuration, but if it is left blank (default) we'll
use the new generated config file.

The generated config file ensures that the server drops root priveleges
and runs as the "lighttpd" user. It pulls in some new config params that
can be set in configuration.nix (here with default values):

  services.lighttpd.document-root = "/srv/www"
  services.lighttpd.port = 80
  services.lighttpd.extraConfig = ""  # appended to the generated file

And it enables access and error logging to the systemd journal.

Patch contributed by Bjørn Forsman.
2013-05-06 13:51:08 +03:00
Evgeny Egorochkin 39ba755873 Move lighttpd.nix to lighttpd/default.nix
So that we later can add sub-services for lighttpd without polluting the
web-servers/ directory.
2013-05-06 13:51:08 +03:00
Phreedom fc06f1ec60 Merge pull request #145 from maggesi/xen-updates
Remove obsolete option in Xen domU module
2013-05-05 09:38:19 -07:00
Phreedom 6c988a593a Merge pull request #136 from MarcWeber/submit/grubDevice
s/boot.grubDevice/boot.loader.grub.device/ to shut down warnings
2013-05-05 07:41:22 -07:00
Evgeny Egorochkin d6df27277b ZFS: automatically import zpools and mount zfs filesystems.
Patch contributed by Jack Cummings.
2013-05-05 16:36:08 +03:00
Shea Levy 17f10f70ad Include xhci_hcd in the initrd for usb3 devices
Fixes #158, I don't think there is an `xhci' module

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 11:35:01 -04:00
Shea Levy faa064dbc7 32-bit gummiboot uses lower-case ia32
Thanks to iElectric in the channel for pointing it out

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 11:26:56 -04:00
Phreedom 7190c867d6 Merge pull request #156 from modulistic/master
typo in networking.dnsSingleRequest documentation
2013-05-04 02:34:28 -07:00
modulistic bdb22d37f1 typo in networking.dnsSingleRequest documentation 2013-05-04 11:26:56 +02:00
Evgeny Egorochkin 4b69de4a3d VirtualBox: udev rule to populate /dev/vboxusb.
After Linux 3.2(?), /proc/bus/usb (and usbfs (or usbdevfs?)) went away,
leaving virtualbox no way to determine what USB devices were connected
to the system. The solution was to add some virtualbox specific udev
rules to populate /dev/vboxusb with what was in /proc/bus/usb before.

Patch contributed by Jack Cummings.
2013-05-04 12:20:46 +03:00
Domen Kožar 01887f2c86 Merge pull request #100 from jcumming/hostapd.130224
proper hostapd dependencies
2013-05-04 01:38:45 -07:00
Rok Garbas f5e720aba8 adding sensor option to thinkfan 2013-05-03 03:28:04 +02:00
Shea Levy 2415787040 gummiboot: Fix bug where old conf scripts for single-digit generations weren't removed
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-30 13:03:14 -04:00
Shea Levy 9bc021ceda Set the firmware_class path in modprobe.d
Activation scripts are run before systemd is started, so unless users
are loading firmware in the initrd (which AFAICT we currently have no
support for) the previous /sys-based setting of firmware_class was
ineffective on boot.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-30 11:46:34 -04:00
Peter Simons ebb9f0e3fc atd: add "batch" to the list of programs that need a setuid wrapper 2013-04-27 22:42:19 +02:00
Lluís Batlle i Rossell 4637f6d878 Removing unneded imports for the display-manager.
Discussed in
2e088aa277 (commitcomment-3074283)
2013-04-28 00:19:04 +04:00
Domen Kožar f34d79c351 Merge pull request #150 from bjornfor/nixos-install-fix-errormsg
nixos-install: fix error message consistency
2013-04-27 09:14:50 -07:00
Domen Kožar c4ead79dd6 Merge pull request #149 from NixOS/networkmanager_suspend
restart networkmanager on suspend resume
2013-04-27 09:13:15 -07:00
Lluís Batlle i Rossell af0e751ee9 Making gnunet start properly (calling gnunet-service-arm directly) 2013-04-24 20:17:14 +04:00
Lluís Batlle i Rossell f50014339a Putting the gnunet module up to date. It still doesn't start gnunet though.
No idea why.
2013-04-24 19:03:29 +04:00
Bjørn Forsman ec13407807 nixos-install: fix error message consistency
The test is for path A but the error message says path B. Fix it.
2013-04-22 22:06:27 +02:00
Lluís Batlle i Rossell b4af56d376 lightdm: improving a bit the indentation. 2013-04-22 23:32:11 +04:00
Oliver Charles 2e088aa277 lightdm: Initial expression for lightdm as the display-manager service (using default GTK greeter) 2013-04-22 23:32:10 +04:00
Domen Kozar ec9dc730ec restart networkmanager on suspend resume 2013-04-22 19:36:14 +02:00
Eelco Dolstra 447691836a Create a /etc/zoneinfo symlink and use it in $TZDIR
Setting $TZDIR to ${pkgs.tzdata}/share/zoneinfo can cause logged-in
sessions to refer to a garbage-collected zoneinfo directory.  So use
/etc/zoneinfo instead.
2013-04-22 19:08:16 +02:00
Eelco Dolstra 945849b86f Don't set $TZ
We don't need to set $TZ, because we have /etc/localtime.  In fact,
setting $TZ without $TZDIR doesn't work anymore since Glibc no longer
contains zone info.
2013-04-22 18:56:19 +02:00
Evgeny Egorochkin fa0f5bf72f Freenet: fix 2 typos 2013-04-22 16:50:58 +03:00
Mathijs Kwik ae2f280b67 cron: set TZDIR so cron is able to find the TZ 2013-04-22 14:24:15 +02:00
Mathijs Kwik 006f328877 virtual network interfaces: make systemd aware of the relation between device and service
If I want to bring down tap0.service (or systemd wants to do this
during a configuration-change which changes the path to tunctl),
openvpn (or other services using tap0) need to be brought down as
well, otherwise tunctl -d is not able to remove the tap0 device,
leaving it in a failed (but "up") state.
2013-04-22 14:24:15 +02:00
Mathijs Kwik 8de00c328a systemd: add "requiredBy" option.
"require" is a stronger version of "want",
and just like wantedBy allows you to specify this relation in reverse,
requiredBy does the same.

It may seem pointless to be able to specify these stronger relations in
reverse, because if something is really required, you would expect the
other unit to specify this himself.

However, this is still useful for virtual/automatic units (like
devices) that are created by systemd on demand and hence have no unit
file you can alter.
2013-04-22 14:24:15 +02:00
Peter Simons 8c702b7c28 Merge pull request #147 from offlinehacker/nameservers
Static nameservers should have precedence
2013-04-22 02:16:11 -07:00
Jaka Hudoklin b230153cfd Merge branch 'master' of https://github.com/NixOS/nixos into nameservers
Conflicts:
	modules/tasks/network-interfaces.nix
2013-04-21 20:02:26 +02:00
Jaka Hudoklin 7427639b84 Static nameservers have precedence 2013-04-21 19:48:15 +02:00
Lluís Batlle i Rossell 7a71320a9c Adding freenet module 2013-04-21 11:27:41 +04:00
Vladimír Čunát 41ccade531 Merge pull request #132 from ierton/udisks2-v2
add udisks2 for Xfce
2013-04-20 01:36:14 -07:00
Shea Levy e32774c270 rabbitmq.nix: Set SYS_PREFIX empty so files live in /var
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-19 10:49:46 -04:00
viric 204f5a3f4c Merge pull request #143 from viric/grub_all
Making grub display 'All configurations', not 'Old'
2013-04-17 08:05:09 -07:00
Lluís Batlle i Rossell 1caa1b96cb network-interfaces: fixing a cat/EOF piping confusion 2013-04-17 09:10:41 +02:00
Lluís Batlle i Rossell 927a3e3ff2 fcron: fixing the startOn, since upstart times. 2013-04-17 00:21:19 +02:00
Marco Maggesi 04415eb582 Remove obsolete option in Xen domU module 2013-04-16 19:46:22 +02:00
Shea Levy cc1ae918bd Fix cut-off comment in generated configuration.nix
Pointed out by Mathnerd626 on irc

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-16 13:34:37 -04:00
Lluís Batlle i Rossell 3be4fd3f38 Making grub display 'All configurations', not 'Old'
That confused some people, as the first generation shown is
the 'current'.
2013-04-16 11:09:25 +02:00
viric 7d2ec75ae7 Merge pull request #128 from pSub/bitlbee
Bitlbee: updated for systemd; added more options like AuthMode
2013-04-14 12:49:18 -07:00
Domen Kožar 25cd3579cb Merge pull request #141 from orbitz/fix-nginx-required-config
Fix nginx required config
2013-04-14 02:28:23 -07:00
orbitz 388d83c586 Set required nginx options and sane default 2013-04-14 11:17:16 +02:00