From 5ebdee3577cb7c458d51460316e36ad393d73bc6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 May 2009 23:13:23 +0000 Subject: [PATCH] * 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 --- .../services/audio}/alsa.nix | 4 +- .../services/audio}/pulseaudio.nix | 4 +- .../services/databases}/mysql.nix | 0 .../services/databases}/postgresql.nix | 0 .../services/hardware}/acpid.nix | 0 .../services/hardware}/hal.nix | 8 +- .../hardware}/udev-firmware-loader.sh | 0 .../services/hardware}/udev.nix | 0 .../services/logging}/klogd.nix | 0 .../services/logging}/syslogd.nix | 0 .../services/mail}/dovecot.nix | 2 +- .../services/mail}/postfix.nix | 2 +- .../services/misc}/autofs.nix | 0 .../services/misc}/disnix.nix | 4 +- .../services/misc/nix-daemon.nix | 0 .../services/misc/nixos-manual.nix | 2 +- .../services/misc}/rogue.nix | 0 .../services/misc}/synergy.nix | 0 .../services/monitoring}/nagios/commands.cfg | 0 .../services/monitoring}/nagios/default.nix | 4 +- .../monitoring}/nagios/host-templates.cfg | 0 .../monitoring}/nagios/service-templates.cfg | 0 .../monitoring}/nagios/timeperiods.cfg | 0 .../services/monitoring}/zabbix-agent.nix | 4 +- .../services/monitoring}/zabbix-server.nix | 4 +- .../network-filesystems}/nfs-kernel.nix | 0 .../services/network-filesystems}/samba.nix | 0 .../services/networking}/avahi-daemon.nix | 11 +- .../services/networking}/bind.nix | 0 .../services/networking}/bitlbee.nix | 0 .../services/networking}/dhclient.nix | 2 +- .../services/networking}/dhcpd.nix | 0 .../services/networking}/ejabberd.nix | 0 .../services/networking}/gnunet.nix | 0 .../services/networking}/gw6c.nix | 0 .../services/networking}/ifplugd.nix | 0 .../services/networking}/ircd-hybrid.nix | 0 .../services/networking}/ntpd.nix | 2 +- .../services/networking}/openfire.nix | 0 .../services/networking}/openvpn.nix | 0 .../services/networking}/portmap.nix | 4 +- .../services/networking/ssh}/lshd.nix | 0 .../services/networking/ssh}/sshd.nix | 4 +- .../services/networking}/vsftpd.nix | 6 +- .../services/printing}/cupsd.nix | 0 .../services/scheduling}/atd.nix | 12 +- .../services/scheduling/atd.pam | 0 .../services/scheduling}/cron.nix | 2 +- .../services/scheduling}/fcron.nix | 0 .../services/system}/consolekit.nix | 4 +- .../services/system}/dbus.nix | 4 +- .../services/system}/nscd.conf | 0 .../services/system}/nscd.nix | 2 +- .../services/ttys}/gpm.nix | 2 +- .../services/ttys}/mingetty.nix | 0 .../web-servers}/apache-httpd/default.nix | 2 +- .../apache-httpd/per-server-options.nix | 0 .../web-servers}/apache-httpd/subversion.nix | 0 .../apache-httpd/tomcat-connector.nix | 0 .../web-servers}/apache-httpd/twiki.nix | 0 .../web-servers}/apache-httpd/zabbix.nix | 0 .../services/web-servers}/jboss.nix | 0 .../services/web-servers}/tomcat.nix | 4 +- .../services/x11}/xfs.conf | 0 .../services/x11}/xfs.nix | 0 .../services/x11}/xserver/default.nix | 6 +- .../x11}/xserver/desktopManager/default.nix | 0 .../x11}/xserver/desktopManager/gnome.nix | 0 .../x11}/xserver/desktopManager/kde.nix | 2 +- .../x11/xserver/desktopManager/kde.pam | 0 .../x11}/xserver/desktopManager/kde4.nix | 2 +- .../xserver/desktopManager/kdeEnvironment.nix | 0 .../x11}/xserver/desktopManager/none.nix | 0 .../x11}/xserver/desktopManager/xterm.nix | 0 .../x11}/xserver/displayManager/default.nix | 0 .../x11}/xserver/displayManager/kdm.nix | 0 .../x11}/xserver/displayManager/slim.nix | 2 +- .../x11/xserver/displayManager/slim.pam | 0 .../x11}/xserver/windowManager/compiz.nix | 0 .../x11}/xserver/windowManager/default.nix | 0 .../x11}/xserver/windowManager/kwm.nix | 0 .../x11}/xserver/windowManager/metacity.nix | 0 .../x11}/xserver/windowManager/none.nix | 0 .../x11}/xserver/windowManager/twm.nix | 0 .../x11}/xserver/windowManager/wmii.nix | 0 .../x11}/xserver/windowManager/xmonad.nix | 0 .../services/x11}/xserver/xserver.conf | 0 system/activate-configuration.nix | 2 +- system/options.nix | 206 +++++++----------- upstart-jobs/cron/locate.nix | 2 +- upstart-jobs/httpd.nix | 134 ------------ 91 files changed, 140 insertions(+), 315 deletions(-) rename {upstart-jobs => modules/services/audio}/alsa.nix (93%) rename {upstart-jobs => modules/services/audio}/pulseaudio.nix (94%) rename {upstart-jobs => modules/services/databases}/mysql.nix (100%) rename {upstart-jobs => modules/services/databases}/postgresql.nix (100%) rename {upstart-jobs => modules/services/hardware}/acpid.nix (100%) rename {upstart-jobs => modules/services/hardware}/hal.nix (90%) rename {upstart-jobs => modules/services/hardware}/udev-firmware-loader.sh (100%) rename {upstart-jobs => modules/services/hardware}/udev.nix (100%) rename {upstart-jobs => modules/services/logging}/klogd.nix (100%) rename {upstart-jobs => modules/services/logging}/syslogd.nix (100%) rename {upstart-jobs => modules/services/mail}/dovecot.nix (98%) rename {upstart-jobs => modules/services/mail}/postfix.nix (99%) rename {upstart-jobs => modules/services/misc}/autofs.nix (100%) rename {upstart-jobs => modules/services/misc}/disnix.nix (94%) rename upstart-jobs/nix.nix => modules/services/misc/nix-daemon.nix (100%) rename upstart-jobs/manual.nix => modules/services/misc/nixos-manual.nix (98%) rename {upstart-jobs => modules/services/misc}/rogue.nix (100%) rename {upstart-jobs => modules/services/misc}/synergy.nix (100%) rename {upstart-jobs => modules/services/monitoring}/nagios/commands.cfg (100%) rename {upstart-jobs => modules/services/monitoring}/nagios/default.nix (97%) rename {upstart-jobs => modules/services/monitoring}/nagios/host-templates.cfg (100%) rename {upstart-jobs => modules/services/monitoring}/nagios/service-templates.cfg (100%) rename {upstart-jobs => modules/services/monitoring}/nagios/timeperiods.cfg (100%) rename {upstart-jobs => modules/services/monitoring}/zabbix-agent.nix (95%) rename {upstart-jobs => modules/services/monitoring}/zabbix-server.nix (96%) rename {upstart-jobs => modules/services/network-filesystems}/nfs-kernel.nix (100%) rename {upstart-jobs => modules/services/network-filesystems}/samba.nix (100%) rename {upstart-jobs => modules/services/networking}/avahi-daemon.nix (91%) rename {upstart-jobs => modules/services/networking}/bind.nix (100%) rename {upstart-jobs => modules/services/networking}/bitlbee.nix (100%) rename {upstart-jobs => modules/services/networking}/dhclient.nix (98%) rename {upstart-jobs => modules/services/networking}/dhcpd.nix (100%) rename {upstart-jobs => modules/services/networking}/ejabberd.nix (100%) rename {upstart-jobs => modules/services/networking}/gnunet.nix (100%) rename {upstart-jobs => modules/services/networking}/gw6c.nix (100%) rename {upstart-jobs => modules/services/networking}/ifplugd.nix (100%) rename {upstart-jobs => modules/services/networking}/ircd-hybrid.nix (100%) rename {upstart-jobs => modules/services/networking}/ntpd.nix (97%) rename {upstart-jobs => modules/services/networking}/openfire.nix (100%) rename {upstart-jobs => modules/services/networking}/openvpn.nix (100%) rename {upstart-jobs => modules/services/networking}/portmap.nix (93%) rename {upstart-jobs => modules/services/networking/ssh}/lshd.nix (100%) rename {upstart-jobs => modules/services/networking/ssh}/sshd.nix (96%) rename {upstart-jobs => modules/services/networking}/vsftpd.nix (95%) rename {upstart-jobs => modules/services/printing}/cupsd.nix (100%) rename {upstart-jobs => modules/services/scheduling}/atd.nix (91%) rename etc/pam.d/atd => modules/services/scheduling/atd.pam (100%) rename {upstart-jobs => modules/services/scheduling}/cron.nix (97%) rename {upstart-jobs => modules/services/scheduling}/fcron.nix (100%) rename {upstart-jobs => modules/services/system}/consolekit.nix (88%) rename {upstart-jobs => modules/services/system}/dbus.nix (94%) rename {upstart-jobs => modules/services/system}/nscd.conf (100%) rename {upstart-jobs => modules/services/system}/nscd.nix (93%) rename {upstart-jobs => modules/services/ttys}/gpm.nix (93%) rename {upstart-jobs => modules/services/ttys}/mingetty.nix (100%) rename {upstart-jobs => modules/services/web-servers}/apache-httpd/default.nix (99%) rename {upstart-jobs => modules/services/web-servers}/apache-httpd/per-server-options.nix (100%) rename {upstart-jobs => modules/services/web-servers}/apache-httpd/subversion.nix (100%) rename {upstart-jobs => modules/services/web-servers}/apache-httpd/tomcat-connector.nix (100%) rename {upstart-jobs => modules/services/web-servers}/apache-httpd/twiki.nix (100%) rename {upstart-jobs => modules/services/web-servers}/apache-httpd/zabbix.nix (100%) rename {upstart-jobs => modules/services/web-servers}/jboss.nix (100%) rename {upstart-jobs => modules/services/web-servers}/tomcat.nix (97%) rename {upstart-jobs => modules/services/x11}/xfs.conf (100%) rename {upstart-jobs => modules/services/x11}/xfs.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/default.nix (99%) rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/default.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/gnome.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/kde.nix (97%) rename etc/pam.d/kde => modules/services/x11/xserver/desktopManager/kde.pam (100%) rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/kde4.nix (97%) rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/kdeEnvironment.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/none.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/desktopManager/xterm.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/displayManager/default.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/displayManager/kdm.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/displayManager/slim.nix (98%) rename etc/pam.d/slim => modules/services/x11/xserver/displayManager/slim.pam (100%) rename {upstart-jobs => modules/services/x11}/xserver/windowManager/compiz.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/windowManager/default.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/windowManager/kwm.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/windowManager/metacity.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/windowManager/none.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/windowManager/twm.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/windowManager/wmii.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/windowManager/xmonad.nix (100%) rename {upstart-jobs => modules/services/x11}/xserver/xserver.conf (100%) delete mode 100644 upstart-jobs/httpd.nix diff --git a/upstart-jobs/alsa.nix b/modules/services/audio/alsa.nix similarity index 93% rename from upstart-jobs/alsa.nix rename to modules/services/audio/alsa.nix index d5dd5bec0e4..51c2e924438 100644 --- a/upstart-jobs/alsa.nix +++ b/modules/services/audio/alsa.nix @@ -34,7 +34,7 @@ let # not used (e.g., doesn't own any devices). group = { name = "audio"; - gid = (import ../system/ids.nix).gids.audio; + gid = (import ../../../system/ids.nix).gids.audio; }; job = { @@ -72,7 +72,7 @@ in mkIf config.sound.enable { require = [ - ../upstart-jobs/default.nix # config.services.extraJobs + # ../upstart-jobs/default.nix # config.services.extraJobs # ../system/user.nix # users.* # ? # config.environment.extraPackages options diff --git a/upstart-jobs/pulseaudio.nix b/modules/services/audio/pulseaudio.nix similarity index 94% rename from upstart-jobs/pulseaudio.nix rename to modules/services/audio/pulseaudio.nix index 173f96db7fc..05ec99bae92 100644 --- a/upstart-jobs/pulseaudio.nix +++ b/modules/services/audio/pulseaudio.nix @@ -4,8 +4,8 @@ let inherit (pkgs.lib) mkOption mkIf; - uid = (import ../system/ids.nix).uids.pulseaudio; - gid = (import ../system/ids.nix).gids.pulseaudio; + uid = (import ../../../system/ids.nix).uids.pulseaudio; + gid = (import ../../../system/ids.nix).gids.pulseaudio; options = { services = { diff --git a/upstart-jobs/mysql.nix b/modules/services/databases/mysql.nix similarity index 100% rename from upstart-jobs/mysql.nix rename to modules/services/databases/mysql.nix diff --git a/upstart-jobs/postgresql.nix b/modules/services/databases/postgresql.nix similarity index 100% rename from upstart-jobs/postgresql.nix rename to modules/services/databases/postgresql.nix diff --git a/upstart-jobs/acpid.nix b/modules/services/hardware/acpid.nix similarity index 100% rename from upstart-jobs/acpid.nix rename to modules/services/hardware/acpid.nix diff --git a/upstart-jobs/hal.nix b/modules/services/hardware/hal.nix similarity index 90% rename from upstart-jobs/hal.nix rename to modules/services/hardware/hal.nix index d9e53a268e7..4a12973b853 100644 --- a/upstart-jobs/hal.nix +++ b/modules/services/hardware/hal.nix @@ -36,13 +36,13 @@ let user = { name = "haldaemon"; - uid = (import ../system/ids.nix).uids.haldaemon; + uid = (import ../../../system/ids.nix).uids.haldaemon; description = "HAL daemon user"; }; group = { name = "haldaemon"; - gid = (import ../system/ids.nix).gids.haldaemon; + gid = (import ../../../system/ids.nix).gids.haldaemon; }; fdi = @@ -87,10 +87,10 @@ in mkIf cfg.enable { require = [ - ../upstart-jobs/default.nix # config.services.extraJobs + # ../upstart-jobs/default.nix # config.services.extraJobs # ../system/user.nix # users.* # ../upstart-jobs/udev.nix # services.udev.* - ../upstart-jobs/dbus.nix # services.dbus.* + # ../upstart-jobs/dbus.nix # services.dbus.* # ? # config.environment.extraPackages options ]; diff --git a/upstart-jobs/udev-firmware-loader.sh b/modules/services/hardware/udev-firmware-loader.sh similarity index 100% rename from upstart-jobs/udev-firmware-loader.sh rename to modules/services/hardware/udev-firmware-loader.sh diff --git a/upstart-jobs/udev.nix b/modules/services/hardware/udev.nix similarity index 100% rename from upstart-jobs/udev.nix rename to modules/services/hardware/udev.nix diff --git a/upstart-jobs/klogd.nix b/modules/services/logging/klogd.nix similarity index 100% rename from upstart-jobs/klogd.nix rename to modules/services/logging/klogd.nix diff --git a/upstart-jobs/syslogd.nix b/modules/services/logging/syslogd.nix similarity index 100% rename from upstart-jobs/syslogd.nix rename to modules/services/logging/syslogd.nix diff --git a/upstart-jobs/dovecot.nix b/modules/services/mail/dovecot.nix similarity index 98% rename from upstart-jobs/dovecot.nix rename to modules/services/mail/dovecot.nix index 8a70a5462d1..7bc091deba7 100644 --- a/upstart-jobs/dovecot.nix +++ b/modules/services/mail/dovecot.nix @@ -44,7 +44,7 @@ let startingDependency = if config.services.gw6c.enable then "gw6c" else "network-interfaces"; cfg = config.services.dovecot; - idList = import ../system/ids.nix; + idList = import ../../../system/ids.nix; dovecotConf = '' diff --git a/upstart-jobs/postfix.nix b/modules/services/mail/postfix.nix similarity index 99% rename from upstart-jobs/postfix.nix rename to modules/services/mail/postfix.nix index 8db43693b94..b92bef666a0 100644 --- a/upstart-jobs/postfix.nix +++ b/modules/services/mail/postfix.nix @@ -156,7 +156,7 @@ let user = cfg.user; group = cfg.group; setgidGroup = cfg.setgidGroup; - idList = import ../system/ids.nix; + idList = import ../../../system/ids.nix; optionalString = pkgs.lib.optionalString; concatStringsSep = pkgs.lib.concatStringsSep; diff --git a/upstart-jobs/autofs.nix b/modules/services/misc/autofs.nix similarity index 100% rename from upstart-jobs/autofs.nix rename to modules/services/misc/autofs.nix diff --git a/upstart-jobs/disnix.nix b/modules/services/misc/disnix.nix similarity index 94% rename from upstart-jobs/disnix.nix rename to modules/services/misc/disnix.nix index cbca7af7f8f..0f80cf6804c 100644 --- a/upstart-jobs/disnix.nix +++ b/modules/services/misc/disnix.nix @@ -48,8 +48,8 @@ in mkIf cfg.enable { require = [ - ../upstart-jobs/default.nix - ../upstart-jobs/dbus.nix # services.dbus.* + #../upstart-jobs/default.nix + #../upstart-jobs/dbus.nix # services.dbus.* options ]; diff --git a/upstart-jobs/nix.nix b/modules/services/misc/nix-daemon.nix similarity index 100% rename from upstart-jobs/nix.nix rename to modules/services/misc/nix-daemon.nix diff --git a/upstart-jobs/manual.nix b/modules/services/misc/nixos-manual.nix similarity index 98% rename from upstart-jobs/manual.nix rename to modules/services/misc/nixos-manual.nix index 52cc9cd2a80..9ff0150c921 100644 --- a/upstart-jobs/manual.nix +++ b/modules/services/misc/nixos-manual.nix @@ -78,7 +78,7 @@ mkIf enable { services = { extraJobs = [{ - name = "showManual"; + name = "nixos-manual"; job = '' description "NixOS manual" diff --git a/upstart-jobs/rogue.nix b/modules/services/misc/rogue.nix similarity index 100% rename from upstart-jobs/rogue.nix rename to modules/services/misc/rogue.nix diff --git a/upstart-jobs/synergy.nix b/modules/services/misc/synergy.nix similarity index 100% rename from upstart-jobs/synergy.nix rename to modules/services/misc/synergy.nix diff --git a/upstart-jobs/nagios/commands.cfg b/modules/services/monitoring/nagios/commands.cfg similarity index 100% rename from upstart-jobs/nagios/commands.cfg rename to modules/services/monitoring/nagios/commands.cfg diff --git a/upstart-jobs/nagios/default.nix b/modules/services/monitoring/nagios/default.nix similarity index 97% rename from upstart-jobs/nagios/default.nix rename to modules/services/monitoring/nagios/default.nix index 4bfbae4e413..c88f486a787 100644 --- a/upstart-jobs/nagios/default.nix +++ b/modules/services/monitoring/nagios/default.nix @@ -137,7 +137,7 @@ let user = { name = nagiosUser; - uid = (import ../../system/ids.nix).uids.nagios; + uid = (import ../../../../system/ids.nix).uids.nagios; description = "Nagios monitoring daemon"; home = nagiosState; }; @@ -175,7 +175,7 @@ in mkIf cfg.enable { require = [ - ../../upstart-jobs/default.nix # config.services.extraJobs + # ../../upstart-jobs/default.nix # config.services.extraJobs # ../../system/user.nix # users = { .. } # ? # config.environment.etc # ? # config.environment.extraPackages diff --git a/upstart-jobs/nagios/host-templates.cfg b/modules/services/monitoring/nagios/host-templates.cfg similarity index 100% rename from upstart-jobs/nagios/host-templates.cfg rename to modules/services/monitoring/nagios/host-templates.cfg diff --git a/upstart-jobs/nagios/service-templates.cfg b/modules/services/monitoring/nagios/service-templates.cfg similarity index 100% rename from upstart-jobs/nagios/service-templates.cfg rename to modules/services/monitoring/nagios/service-templates.cfg diff --git a/upstart-jobs/nagios/timeperiods.cfg b/modules/services/monitoring/nagios/timeperiods.cfg similarity index 100% rename from upstart-jobs/nagios/timeperiods.cfg rename to modules/services/monitoring/nagios/timeperiods.cfg diff --git a/upstart-jobs/zabbix-agent.nix b/modules/services/monitoring/zabbix-agent.nix similarity index 95% rename from upstart-jobs/zabbix-agent.nix rename to modules/services/monitoring/zabbix-agent.nix index a310c12a50a..402e57d21b5 100644 --- a/upstart-jobs/zabbix-agent.nix +++ b/modules/services/monitoring/zabbix-agent.nix @@ -52,7 +52,7 @@ let user = { name = "zabbix"; - uid = (import ../system/ids.nix).uids.zabbix; + uid = (import ../../../system/ids.nix).uids.zabbix; description = "Zabbix daemon user"; }; @@ -93,7 +93,7 @@ in { require = [ - ../upstart-jobs/default.nix + # ../upstart-jobs/default.nix # ../system/user.nix # users = { .. } options ]; diff --git a/upstart-jobs/zabbix-server.nix b/modules/services/monitoring/zabbix-server.nix similarity index 96% rename from upstart-jobs/zabbix-server.nix rename to modules/services/monitoring/zabbix-server.nix index bc083d03163..265565ba602 100644 --- a/upstart-jobs/zabbix-server.nix +++ b/modules/services/monitoring/zabbix-server.nix @@ -42,7 +42,7 @@ let user = { name = "zabbix"; - uid = (import ../system/ids.nix).uids.zabbix; + uid = (import ../../../system/ids.nix).uids.zabbix; description = "Zabbix daemon user"; }; @@ -86,7 +86,7 @@ in { require = [ - ../upstart-jobs/default.nix + # ../upstart-jobs/default.nix # ../system/user.nix # users = { .. } options ]; diff --git a/upstart-jobs/nfs-kernel.nix b/modules/services/network-filesystems/nfs-kernel.nix similarity index 100% rename from upstart-jobs/nfs-kernel.nix rename to modules/services/network-filesystems/nfs-kernel.nix diff --git a/upstart-jobs/samba.nix b/modules/services/network-filesystems/samba.nix similarity index 100% rename from upstart-jobs/samba.nix rename to modules/services/network-filesystems/samba.nix diff --git a/upstart-jobs/avahi-daemon.nix b/modules/services/networking/avahi-daemon.nix similarity index 91% rename from upstart-jobs/avahi-daemon.nix rename to modules/services/networking/avahi-daemon.nix index 063b16b8f4d..a504bf9b6a0 100644 --- a/upstart-jobs/avahi-daemon.nix +++ b/modules/services/networking/avahi-daemon.nix @@ -120,12 +120,12 @@ in mkIf cfg.enable { require = [ - ../upstart-jobs/default.nix # config.services.extraJobs + # ../upstart-jobs/default.nix # config.services.extraJobs # ../system/? # system.nssModules # ? # config.environment.etc # ../system/user.nix # users.* # ../upstart-jobs/udev.nix # services.udev.* - ../upstart-jobs/dbus.nix # services.dbus.* + # ../upstart-jobs/dbus.nix # services.dbus.* # ? # config.environment.extraPackages options ]; @@ -138,14 +138,17 @@ mkIf cfg.enable { extraPackages = [avahi]; # Name Service Switch configuration file. Required by the C library. + # !!! This should be done in some other way, e.g., this module + # should define an option used by the hypothetical module that + # generates nsswitch.conf. etc = mkIf cfg.nssmdns (mkThenElse { thenPart = [{ - source = ../etc/nsswitch-mdns.conf; + source = ../../../etc/nsswitch-mdns.conf; target = "nsswitch.conf"; }]; elsePart = [{ - source = ../etc/nsswitch.conf; + source = ../../../etc/nsswitch.conf; target = "nsswitch.conf"; }]; }); diff --git a/upstart-jobs/bind.nix b/modules/services/networking/bind.nix similarity index 100% rename from upstart-jobs/bind.nix rename to modules/services/networking/bind.nix diff --git a/upstart-jobs/bitlbee.nix b/modules/services/networking/bitlbee.nix similarity index 100% rename from upstart-jobs/bitlbee.nix rename to modules/services/networking/bitlbee.nix diff --git a/upstart-jobs/dhclient.nix b/modules/services/networking/dhclient.nix similarity index 98% rename from upstart-jobs/dhclient.nix rename to modules/services/networking/dhclient.nix index ddf1bf9cffb..32e71f5af60 100644 --- a/upstart-jobs/dhclient.nix +++ b/modules/services/networking/dhclient.nix @@ -55,7 +55,7 @@ in { require = [ - ../upstart-jobs/default.nix + #../upstart-jobs/default.nix options ]; diff --git a/upstart-jobs/dhcpd.nix b/modules/services/networking/dhcpd.nix similarity index 100% rename from upstart-jobs/dhcpd.nix rename to modules/services/networking/dhcpd.nix diff --git a/upstart-jobs/ejabberd.nix b/modules/services/networking/ejabberd.nix similarity index 100% rename from upstart-jobs/ejabberd.nix rename to modules/services/networking/ejabberd.nix diff --git a/upstart-jobs/gnunet.nix b/modules/services/networking/gnunet.nix similarity index 100% rename from upstart-jobs/gnunet.nix rename to modules/services/networking/gnunet.nix diff --git a/upstart-jobs/gw6c.nix b/modules/services/networking/gw6c.nix similarity index 100% rename from upstart-jobs/gw6c.nix rename to modules/services/networking/gw6c.nix diff --git a/upstart-jobs/ifplugd.nix b/modules/services/networking/ifplugd.nix similarity index 100% rename from upstart-jobs/ifplugd.nix rename to modules/services/networking/ifplugd.nix diff --git a/upstart-jobs/ircd-hybrid.nix b/modules/services/networking/ircd-hybrid.nix similarity index 100% rename from upstart-jobs/ircd-hybrid.nix rename to modules/services/networking/ircd-hybrid.nix diff --git a/upstart-jobs/ntpd.nix b/modules/services/networking/ntpd.nix similarity index 97% rename from upstart-jobs/ntpd.nix rename to modules/services/networking/ntpd.nix index 93c88734e39..b7723347ea3 100644 --- a/upstart-jobs/ntpd.nix +++ b/modules/services/networking/ntpd.nix @@ -72,7 +72,7 @@ mkIf config.services.ntp.enable { users = [ { name = ntpUser; - uid = (import ../system/ids.nix).uids.ntp; + uid = (import ../../../system/ids.nix).uids.ntp; description = "NTP daemon user"; home = stateDir; } diff --git a/upstart-jobs/openfire.nix b/modules/services/networking/openfire.nix similarity index 100% rename from upstart-jobs/openfire.nix rename to modules/services/networking/openfire.nix diff --git a/upstart-jobs/openvpn.nix b/modules/services/networking/openvpn.nix similarity index 100% rename from upstart-jobs/openvpn.nix rename to modules/services/networking/openvpn.nix diff --git a/upstart-jobs/portmap.nix b/modules/services/networking/portmap.nix similarity index 93% rename from upstart-jobs/portmap.nix rename to modules/services/networking/portmap.nix index e188a2d41b6..74f2fd68e79 100644 --- a/upstart-jobs/portmap.nix +++ b/modules/services/networking/portmap.nix @@ -37,8 +37,8 @@ in ###### implementation -let uid = (import ../system/ids.nix).uids.portmap; - gid = (import ../system/ids.nix).gids.portmap; +let uid = (import ../../../system/ids.nix).uids.portmap; + gid = (import ../../../system/ids.nix).gids.portmap; in mkIf config.services.portmap.enable { diff --git a/upstart-jobs/lshd.nix b/modules/services/networking/ssh/lshd.nix similarity index 100% rename from upstart-jobs/lshd.nix rename to modules/services/networking/ssh/lshd.nix diff --git a/upstart-jobs/sshd.nix b/modules/services/networking/ssh/sshd.nix similarity index 96% rename from upstart-jobs/sshd.nix rename to modules/services/networking/ssh/sshd.nix index 38ccb2c19a1..a50bafac236 100644 --- a/upstart-jobs/sshd.nix +++ b/modules/services/networking/ssh/sshd.nix @@ -85,7 +85,7 @@ let ''; - sshdUid = (import ../system/ids.nix).uids.sshd; + sshdUid = (import ../../../../system/ids.nix).uids.sshd; # !!! is this assertion evaluated anywhere??? assertion = cfg.permitRootLogin == "yes" || @@ -104,7 +104,7 @@ mkIf config.services.sshd.enable { users = { extraUsers = [ { name = "sshd"; - uid = (import ../system/ids.nix).uids.sshd; + uid = (import ../../../../system/ids.nix).uids.sshd; description = "SSH privilege separation user"; home = "/var/empty"; } diff --git a/upstart-jobs/vsftpd.nix b/modules/services/networking/vsftpd.nix similarity index 95% rename from upstart-jobs/vsftpd.nix rename to modules/services/networking/vsftpd.nix index c112967e45f..753fde465d7 100644 --- a/upstart-jobs/vsftpd.nix +++ b/modules/services/networking/vsftpd.nix @@ -95,13 +95,13 @@ mkIf config.services.vsftpd.enable { users = { extraUsers = [ { name = "vsftpd"; - uid = (import ../system/ids.nix).uids.vsftpd; + uid = (import ../../../system/ids.nix).uids.vsftpd; description = "VSFTPD user"; home = "/homeless-shelter"; } ] ++ pkgs.lib.optional anonymousUser { name = "ftp"; - uid = (import ../system/ids.nix).uids.ftp; + uid = (import ../../../system/ids.nix).uids.ftp; group = "ftp"; description = "Anonymous ftp user"; home = "/home/ftp"; @@ -109,7 +109,7 @@ mkIf config.services.vsftpd.enable { extraGroups = [ { name = "ftp"; - gid = (import ../system/ids.nix).gids.ftp; + gid = (import ../../../system/ids.nix).gids.ftp; } ]; diff --git a/upstart-jobs/cupsd.nix b/modules/services/printing/cupsd.nix similarity index 100% rename from upstart-jobs/cupsd.nix rename to modules/services/printing/cupsd.nix diff --git a/upstart-jobs/atd.nix b/modules/services/scheduling/atd.nix similarity index 91% rename from upstart-jobs/atd.nix rename to modules/services/scheduling/atd.nix index 60f1daf7949..bf5861d8e4f 100644 --- a/upstart-jobs/atd.nix +++ b/modules/services/scheduling/atd.nix @@ -37,14 +37,14 @@ let user = { name = "atd"; - uid = (import ../system/ids.nix).uids.atd; + uid = (import ../../../system/ids.nix).uids.atd; description = "atd user"; home = "/var/empty"; }; group = { name = "atd"; - gid = (import ../system/ids.nix).gids.atd; + gid = (import ../../../system/ids.nix).gids.atd; }; job = '' @@ -95,13 +95,13 @@ mkIf cfg.enable { options # config.services.extraJobs - ../upstart-jobs/default.nix + #../upstart-jobs/default.nix # config.environment.etc - ../etc/default.nix + #../etc/default.nix # users.* - ../system/users-groups.nix + #../system/users-groups.nix # ? # config.environment.extraPackages # ? # config.security.extraSetuidPrograms @@ -121,7 +121,7 @@ mkIf cfg.enable { extraPackages = [ at ]; etc = [{ - source = ../etc/pam.d/atd; + source = ./atd.pam; target = "pam.d/atd"; }]; }; diff --git a/etc/pam.d/atd b/modules/services/scheduling/atd.pam similarity index 100% rename from etc/pam.d/atd rename to modules/services/scheduling/atd.pam diff --git a/upstart-jobs/cron.nix b/modules/services/scheduling/cron.nix similarity index 97% rename from upstart-jobs/cron.nix rename to modules/services/scheduling/cron.nix index a73a7eefa00..cef505c9a34 100644 --- a/upstart-jobs/cron.nix +++ b/modules/services/scheduling/cron.nix @@ -54,7 +54,7 @@ in { require = [ - ../upstart-jobs/default.nix # config.services.extraJobs + # ../upstart-jobs/default.nix # config.services.extraJobs # ? # config.time.timeZone # ? # config.environment.etc # ? # config.environment.extraPackages diff --git a/upstart-jobs/fcron.nix b/modules/services/scheduling/fcron.nix similarity index 100% rename from upstart-jobs/fcron.nix rename to modules/services/scheduling/fcron.nix diff --git a/upstart-jobs/consolekit.nix b/modules/services/system/consolekit.nix similarity index 88% rename from upstart-jobs/consolekit.nix rename to modules/services/system/consolekit.nix index 554d2c4cfb6..de3fc8897c0 100644 --- a/upstart-jobs/consolekit.nix +++ b/modules/services/system/consolekit.nix @@ -43,8 +43,8 @@ in mkIf cfg.enable { require = [ - ../upstart-jobs/default.nix # config.services.extraJobs - ../upstart-jobs/dbus.nix # services.dbus.* + #../upstart-jobs/default.nix # config.services.extraJobs + #../upstart-jobs/dbus.nix # services.dbus.* options ]; diff --git a/upstart-jobs/dbus.nix b/modules/services/system/dbus.nix similarity index 94% rename from upstart-jobs/dbus.nix rename to modules/services/system/dbus.nix index 6d67970576a..b277a5e95c1 100644 --- a/upstart-jobs/dbus.nix +++ b/modules/services/system/dbus.nix @@ -55,7 +55,7 @@ let user = { name = "messagebus"; - uid = (import ../system/ids.nix).uids.messagebus; + uid = (import ../../../system/ids.nix).uids.messagebus; description = "D-Bus system message bus daemon user"; home = homeDir; }; @@ -96,7 +96,7 @@ in mkIf cfg.enable { require = [ - ../upstart-jobs/default.nix # config.services.extraJobs + # ../upstart-jobs/default.nix # config.services.extraJobs # ../system/user.nix # users.* # ? # config.environment.extraPackages options diff --git a/upstart-jobs/nscd.conf b/modules/services/system/nscd.conf similarity index 100% rename from upstart-jobs/nscd.conf rename to modules/services/system/nscd.conf diff --git a/upstart-jobs/nscd.nix b/modules/services/system/nscd.nix similarity index 93% rename from upstart-jobs/nscd.nix rename to modules/services/system/nscd.nix index fe89cdc5646..d2b01876e85 100644 --- a/upstart-jobs/nscd.nix +++ b/modules/services/system/nscd.nix @@ -13,7 +13,7 @@ in users = [ { name = "nscd"; - uid = (import ../system/ids.nix).uids.nscd; + uid = (import ../../../system/ids.nix).uids.nscd; description = "Name service cache daemon user"; } ]; diff --git a/upstart-jobs/gpm.nix b/modules/services/ttys/gpm.nix similarity index 93% rename from upstart-jobs/gpm.nix rename to modules/services/ttys/gpm.nix index fb4f3be5890..35ecab0083d 100644 --- a/upstart-jobs/gpm.nix +++ b/modules/services/ttys/gpm.nix @@ -47,7 +47,7 @@ in mkIf cfg.enable { require = [ - ../upstart-jobs/default.nix # config.services.extraJobs + # ../upstart-jobs/default.nix # config.services.extraJobs # /etc/security/console.perms (should be generated ?) options ]; diff --git a/upstart-jobs/mingetty.nix b/modules/services/ttys/mingetty.nix similarity index 100% rename from upstart-jobs/mingetty.nix rename to modules/services/ttys/mingetty.nix diff --git a/upstart-jobs/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix similarity index 99% rename from upstart-jobs/apache-httpd/default.nix rename to modules/services/web-servers/apache-httpd/default.nix index b8fb5df4d48..60185c6bbc1 100644 --- a/upstart-jobs/apache-httpd/default.nix +++ b/modules/services/web-servers/apache-httpd/default.nix @@ -195,7 +195,7 @@ let }; } // # Include the options shared between the main server and virtual hosts. - (import ../../upstart-jobs/apache-httpd/per-server-options.nix { + (import ./per-server-options.nix { inherit mkOption; forMainServer = true; }); diff --git a/upstart-jobs/apache-httpd/per-server-options.nix b/modules/services/web-servers/apache-httpd/per-server-options.nix similarity index 100% rename from upstart-jobs/apache-httpd/per-server-options.nix rename to modules/services/web-servers/apache-httpd/per-server-options.nix diff --git a/upstart-jobs/apache-httpd/subversion.nix b/modules/services/web-servers/apache-httpd/subversion.nix similarity index 100% rename from upstart-jobs/apache-httpd/subversion.nix rename to modules/services/web-servers/apache-httpd/subversion.nix diff --git a/upstart-jobs/apache-httpd/tomcat-connector.nix b/modules/services/web-servers/apache-httpd/tomcat-connector.nix similarity index 100% rename from upstart-jobs/apache-httpd/tomcat-connector.nix rename to modules/services/web-servers/apache-httpd/tomcat-connector.nix diff --git a/upstart-jobs/apache-httpd/twiki.nix b/modules/services/web-servers/apache-httpd/twiki.nix similarity index 100% rename from upstart-jobs/apache-httpd/twiki.nix rename to modules/services/web-servers/apache-httpd/twiki.nix diff --git a/upstart-jobs/apache-httpd/zabbix.nix b/modules/services/web-servers/apache-httpd/zabbix.nix similarity index 100% rename from upstart-jobs/apache-httpd/zabbix.nix rename to modules/services/web-servers/apache-httpd/zabbix.nix diff --git a/upstart-jobs/jboss.nix b/modules/services/web-servers/jboss.nix similarity index 100% rename from upstart-jobs/jboss.nix rename to modules/services/web-servers/jboss.nix diff --git a/upstart-jobs/tomcat.nix b/modules/services/web-servers/tomcat.nix similarity index 97% rename from upstart-jobs/tomcat.nix rename to modules/services/web-servers/tomcat.nix index f714e2387f3..592fd0fcbf5 100644 --- a/upstart-jobs/tomcat.nix +++ b/modules/services/web-servers/tomcat.nix @@ -73,13 +73,13 @@ mkIf config.services.tomcat.enable { groups = [ { name = "tomcat"; - gid = (import ../system/ids.nix).gids.tomcat; + gid = (import ../../../system/ids.nix).gids.tomcat; } ]; users = [ { name = "tomcat"; - uid = (import ../system/ids.nix).uids.tomcat; + uid = (import ../../../system/ids.nix).uids.tomcat; description = "Tomcat user"; home = "/homeless-shelter"; } diff --git a/upstart-jobs/xfs.conf b/modules/services/x11/xfs.conf similarity index 100% rename from upstart-jobs/xfs.conf rename to modules/services/x11/xfs.conf diff --git a/upstart-jobs/xfs.nix b/modules/services/x11/xfs.nix similarity index 100% rename from upstart-jobs/xfs.nix rename to modules/services/x11/xfs.nix diff --git a/upstart-jobs/xserver/default.nix b/modules/services/x11/xserver/default.nix similarity index 99% rename from upstart-jobs/xserver/default.nix rename to modules/services/x11/xserver/default.nix index 496a2a9e352..42642aa9137 100644 --- a/upstart-jobs/xserver/default.nix +++ b/modules/services/x11/xserver/default.nix @@ -475,13 +475,13 @@ mkIf cfg.enable { ./desktopManager/default.nix # services.extraJobs - ../../upstart-jobs/default.nix + # ../../upstart-jobs/default.nix # environment.etc - ../../etc/default.nix + # ../../etc/default.nix # fonts.fonts - ../../system/fonts.nix + # ../../system/fonts.nix # boot.extraModulePackages # security.extraSetuidPrograms diff --git a/upstart-jobs/xserver/desktopManager/default.nix b/modules/services/x11/xserver/desktopManager/default.nix similarity index 100% rename from upstart-jobs/xserver/desktopManager/default.nix rename to modules/services/x11/xserver/desktopManager/default.nix diff --git a/upstart-jobs/xserver/desktopManager/gnome.nix b/modules/services/x11/xserver/desktopManager/gnome.nix similarity index 100% rename from upstart-jobs/xserver/desktopManager/gnome.nix rename to modules/services/x11/xserver/desktopManager/gnome.nix diff --git a/upstart-jobs/xserver/desktopManager/kde.nix b/modules/services/x11/xserver/desktopManager/kde.nix similarity index 97% rename from upstart-jobs/xserver/desktopManager/kde.nix rename to modules/services/x11/xserver/desktopManager/kde.nix index c9c1d239f43..15fbf666e9c 100644 --- a/upstart-jobs/xserver/desktopManager/kde.nix +++ b/modules/services/x11/xserver/desktopManager/kde.nix @@ -68,7 +68,7 @@ mkIf cfg.enable { ]; etc = [ - { source = ../../../etc/pam.d/kde; + { source = ./kde.pam; target = "pam.d/kde"; } { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; diff --git a/etc/pam.d/kde b/modules/services/x11/xserver/desktopManager/kde.pam similarity index 100% rename from etc/pam.d/kde rename to modules/services/x11/xserver/desktopManager/kde.pam diff --git a/upstart-jobs/xserver/desktopManager/kde4.nix b/modules/services/x11/xserver/desktopManager/kde4.nix similarity index 97% rename from upstart-jobs/xserver/desktopManager/kde4.nix rename to modules/services/x11/xserver/desktopManager/kde4.nix index c23fa163a39..6cd25b3b459 100644 --- a/upstart-jobs/xserver/desktopManager/kde4.nix +++ b/modules/services/x11/xserver/desktopManager/kde4.nix @@ -64,7 +64,7 @@ mkIf cfg.enable { ]; etc = [ - { source = ../../../etc/pam.d/kde; + { source = ./kde.pam; target = "pam.d/kde"; } { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; diff --git a/upstart-jobs/xserver/desktopManager/kdeEnvironment.nix b/modules/services/x11/xserver/desktopManager/kdeEnvironment.nix similarity index 100% rename from upstart-jobs/xserver/desktopManager/kdeEnvironment.nix rename to modules/services/x11/xserver/desktopManager/kdeEnvironment.nix diff --git a/upstart-jobs/xserver/desktopManager/none.nix b/modules/services/x11/xserver/desktopManager/none.nix similarity index 100% rename from upstart-jobs/xserver/desktopManager/none.nix rename to modules/services/x11/xserver/desktopManager/none.nix diff --git a/upstart-jobs/xserver/desktopManager/xterm.nix b/modules/services/x11/xserver/desktopManager/xterm.nix similarity index 100% rename from upstart-jobs/xserver/desktopManager/xterm.nix rename to modules/services/x11/xserver/desktopManager/xterm.nix diff --git a/upstart-jobs/xserver/displayManager/default.nix b/modules/services/x11/xserver/displayManager/default.nix similarity index 100% rename from upstart-jobs/xserver/displayManager/default.nix rename to modules/services/x11/xserver/displayManager/default.nix diff --git a/upstart-jobs/xserver/displayManager/kdm.nix b/modules/services/x11/xserver/displayManager/kdm.nix similarity index 100% rename from upstart-jobs/xserver/displayManager/kdm.nix rename to modules/services/x11/xserver/displayManager/kdm.nix diff --git a/upstart-jobs/xserver/displayManager/slim.nix b/modules/services/x11/xserver/displayManager/slim.nix similarity index 98% rename from upstart-jobs/xserver/displayManager/slim.nix rename to modules/services/x11/xserver/displayManager/slim.nix index 8e29bc77a5d..b3be8334b65 100644 --- a/upstart-jobs/xserver/displayManager/slim.nix +++ b/modules/services/x11/xserver/displayManager/slim.nix @@ -131,7 +131,7 @@ mkIf cfg.enable { environment = { etc = [ - { source = ../../../etc/pam.d/slim; + { source = ./slim.pam; target = "pam.d/slim"; } ]; diff --git a/etc/pam.d/slim b/modules/services/x11/xserver/displayManager/slim.pam similarity index 100% rename from etc/pam.d/slim rename to modules/services/x11/xserver/displayManager/slim.pam diff --git a/upstart-jobs/xserver/windowManager/compiz.nix b/modules/services/x11/xserver/windowManager/compiz.nix similarity index 100% rename from upstart-jobs/xserver/windowManager/compiz.nix rename to modules/services/x11/xserver/windowManager/compiz.nix diff --git a/upstart-jobs/xserver/windowManager/default.nix b/modules/services/x11/xserver/windowManager/default.nix similarity index 100% rename from upstart-jobs/xserver/windowManager/default.nix rename to modules/services/x11/xserver/windowManager/default.nix diff --git a/upstart-jobs/xserver/windowManager/kwm.nix b/modules/services/x11/xserver/windowManager/kwm.nix similarity index 100% rename from upstart-jobs/xserver/windowManager/kwm.nix rename to modules/services/x11/xserver/windowManager/kwm.nix diff --git a/upstart-jobs/xserver/windowManager/metacity.nix b/modules/services/x11/xserver/windowManager/metacity.nix similarity index 100% rename from upstart-jobs/xserver/windowManager/metacity.nix rename to modules/services/x11/xserver/windowManager/metacity.nix diff --git a/upstart-jobs/xserver/windowManager/none.nix b/modules/services/x11/xserver/windowManager/none.nix similarity index 100% rename from upstart-jobs/xserver/windowManager/none.nix rename to modules/services/x11/xserver/windowManager/none.nix diff --git a/upstart-jobs/xserver/windowManager/twm.nix b/modules/services/x11/xserver/windowManager/twm.nix similarity index 100% rename from upstart-jobs/xserver/windowManager/twm.nix rename to modules/services/x11/xserver/windowManager/twm.nix diff --git a/upstart-jobs/xserver/windowManager/wmii.nix b/modules/services/x11/xserver/windowManager/wmii.nix similarity index 100% rename from upstart-jobs/xserver/windowManager/wmii.nix rename to modules/services/x11/xserver/windowManager/wmii.nix diff --git a/upstart-jobs/xserver/windowManager/xmonad.nix b/modules/services/x11/xserver/windowManager/xmonad.nix similarity index 100% rename from upstart-jobs/xserver/windowManager/xmonad.nix rename to modules/services/x11/xserver/windowManager/xmonad.nix diff --git a/upstart-jobs/xserver/xserver.conf b/modules/services/x11/xserver/xserver.conf similarity index 100% rename from upstart-jobs/xserver/xserver.conf rename to modules/services/x11/xserver/xserver.conf diff --git a/system/activate-configuration.nix b/system/activate-configuration.nix index 0db6f50e77c..8e9029d0943 100644 --- a/system/activate-configuration.nix +++ b/system/activate-configuration.nix @@ -42,7 +42,7 @@ in activateLib = removeAttrs withHeadlines ["activate"]; activateLibNames = attrNames activateLib; in { - script = pkgs.writeScript "activationScript" + script = pkgs.writeScript "nixos-activation-script" ("#!/bin/sh\n" + textClosureMap id activateLib activateLibNames + "\n" # make sure that the activate snippet is added last. diff --git a/system/options.nix b/system/options.nix index 028afdae115..5932bc997be 100644 --- a/system/options.nix +++ b/system/options.nix @@ -379,133 +379,89 @@ in }; require = [ - - ../system/assertion.nix - - # boot (is it the right place ?) - ../system/kernel.nix + #../modules/hardware/network/intel-3945abg.nix ../boot/boot-stage-2.nix - ../installer/grub.nix - - # system - ../system/system-options.nix - ../system/activate-configuration.nix - ../upstart-jobs/default.nix - - ../upstart-jobs/acpid.nix # ACPI daemon - - ../system/unix-odbc-drivers.nix - - ../upstart-jobs/klogd.nix - - ../upstart-jobs/lvm.nix # Makes LVM logical volumes available. - - ../upstart-jobs/swraid.nix # Activate software RAID arrays. - - ../upstart-jobs/filesystems.nix # Mount file systems. - - ../upstart-jobs/swap.nix - ../upstart-jobs/network-interfaces.nix - ../upstart-jobs/nscd.nix # Name service cache daemon. - ../upstart-jobs/maintenance-shell.nix # Handles the maintenance/stalled event (single-user shell). - ../upstart-jobs/ctrl-alt-delete.nix # Ctrl-alt-delete action. - ../upstart-jobs/halt.nix - ../upstart-jobs/ifplugd.nix # ifplugd daemon for monitoring Ethernet cables. - - - # security - ../system/sudo.nix - - # i18n - ../system/i18n.nix - - # environment ../etc/default.nix - - ../system/nixos-environment.nix - - # users - ../system/users-groups.nix - - # newtworking - ../upstart-jobs/dhclient.nix - - # hardware - ../upstart-jobs/pcmcia.nix - - # security - ../system/nixos-security.nix - - # services - ../upstart-jobs/avahi-daemon.nix - ../upstart-jobs/atd.nix - ../upstart-jobs/dbus.nix - ../upstart-jobs/hal.nix - ../upstart-jobs/gpm.nix - ../upstart-jobs/nagios/default.nix - ../upstart-jobs/xserver/default.nix - ../upstart-jobs/zabbix-agent.nix - ../upstart-jobs/zabbix-server.nix - ../upstart-jobs/disnix.nix - ../upstart-jobs/consolekit.nix - ../upstart-jobs/cron.nix - ../upstart-jobs/fcron.nix - ../upstart-jobs/cron/locate.nix - ../upstart-jobs/manual.nix - ../upstart-jobs/rogue.nix - ../upstart-jobs/guest-users.nix - ../upstart-jobs/pulseaudio.nix - ../upstart-jobs/kbd.nix - ../upstart-jobs/gw6c.nix # Gateway6 - ../upstart-jobs/syslogd.nix - ../upstart-jobs/dhcpd.nix - ../upstart-jobs/sshd.nix - ../upstart-jobs/lshd.nix # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?) - ../upstart-jobs/ntpd.nix - ../upstart-jobs/portmap.nix - ../upstart-jobs/bitlbee.nix - ../upstart-jobs/gnunet.nix - ../upstart-jobs/ejabberd.nix # untested, dosen't compile on x86_64-linux - ../upstart-jobs/jboss.nix - ../upstart-jobs/tomcat.nix # untested, too lazy to get that jdk - ../upstart-jobs/httpd.nix # Apache httpd (probably this can be removed ?) - ../upstart-jobs/apache-httpd # Apache httpd (new style). - ../upstart-jobs/vsftpd.nix - ../upstart-jobs/cupsd.nix # CUPS printing daemon - ../upstart-jobs/udev.nix # The udev daemon creates devices nodes and runs programs when hardware events occur. - ../upstart-jobs/samba.nix # TODO: doesn't start here (?) - ../upstart-jobs/ircd-hybrid.nix # TODO: doesn't compile on x86_64-linux, can't test - ../upstart-jobs/xfs.nix - ../upstart-jobs/mysql.nix - ../upstart-jobs/postgresql.nix - ../upstart-jobs/openfire.nix - ../upstart-jobs/postfix.nix - ../upstart-jobs/dovecot.nix - ../upstart-jobs/bind.nix - - ../upstart-jobs/mingetty.nix # The terminals on ttyX. - ../upstart-jobs/tty-backgrounds.nix - - ../upstart-jobs/synergy.nix - ../upstart-jobs/openvpn.nix - - ../upstart-jobs/nfs-kernel.nix - ../upstart-jobs/autofs.nix - - # nix - ../upstart-jobs/nix.nix # nix options and daemon - ../system/nixos-installer.nix - - - #users - ../upstart-jobs/ldap - - - - # fonts + ../installer/grub.nix + ../modules/services/audio/alsa.nix + ../modules/services/audio/pulseaudio.nix + ../modules/services/databases/mysql.nix + ../modules/services/databases/postgresql.nix + ../modules/services/hardware/acpid.nix + ../modules/services/hardware/hal.nix + ../modules/services/hardware/udev.nix + ../modules/services/logging/klogd.nix + ../modules/services/logging/syslogd.nix + ../modules/services/mail/dovecot.nix + ../modules/services/mail/postfix.nix + ../modules/services/misc/autofs.nix + ../modules/services/misc/disnix.nix + ../modules/services/misc/nix-daemon.nix + ../modules/services/misc/nixos-manual.nix + ../modules/services/misc/rogue.nix + ../modules/services/misc/synergy.nix + ../modules/services/monitoring/nagios/default.nix + ../modules/services/monitoring/zabbix-agent.nix + ../modules/services/monitoring/zabbix-server.nix + ../modules/services/network-filesystems/nfs-kernel.nix + ../modules/services/network-filesystems/samba.nix # TODO: doesn't start here (?) + ../modules/services/networking/avahi-daemon.nix + ../modules/services/networking/bind.nix + ../modules/services/networking/bitlbee.nix + ../modules/services/networking/dhclient.nix + ../modules/services/networking/dhcpd.nix + ../modules/services/networking/ejabberd.nix # untested, dosen't compile on x86_64-linux + ../modules/services/networking/gnunet.nix + ../modules/services/networking/gw6c.nix + ../modules/services/networking/ifplugd.nix + ../modules/services/networking/ircd-hybrid.nix # TODO: doesn't compile on x86_64-linux, can't test + ../modules/services/networking/ntpd.nix + ../modules/services/networking/openfire.nix + ../modules/services/networking/openvpn.nix + ../modules/services/networking/portmap.nix + ../modules/services/networking/ssh/lshd.nix # GNU lshd SSH2 deamon (TODO: does neither start nor generate seed file ?) + ../modules/services/networking/ssh/sshd.nix + ../modules/services/networking/vsftpd.nix + ../modules/services/printing/cupsd.nix + ../modules/services/scheduling/atd.nix + ../modules/services/scheduling/cron.nix + ../modules/services/scheduling/fcron.nix + ../modules/services/system/consolekit.nix + ../modules/services/system/dbus.nix + ../modules/services/system/nscd.nix + ../modules/services/ttys/gpm.nix + ../modules/services/ttys/mingetty.nix + ../modules/services/web-servers/apache-httpd + ../modules/services/web-servers/jboss.nix + ../modules/services/web-servers/tomcat.nix # untested, too lazy to get that jdk + ../modules/services/x11/xfs.nix + ../modules/services/x11/xserver/default.nix + ../system/activate-configuration.nix + ../system/assertion.nix ../system/fonts.nix - - # sound - ../upstart-jobs/alsa.nix + ../system/i18n.nix + ../system/kernel.nix + ../system/nixos-environment.nix + ../system/nixos-installer.nix + ../system/nixos-security.nix + ../system/sudo.nix + ../system/system-options.nix + ../system/unix-odbc-drivers.nix + ../system/users-groups.nix + ../upstart-jobs/cron/locate.nix + ../upstart-jobs/ctrl-alt-delete.nix + ../upstart-jobs/default.nix + ../upstart-jobs/filesystems.nix + ../upstart-jobs/guest-users.nix + ../upstart-jobs/halt.nix + ../upstart-jobs/kbd.nix + ../upstart-jobs/ldap + ../upstart-jobs/lvm.nix + ../upstart-jobs/maintenance-shell.nix + ../upstart-jobs/network-interfaces.nix + ../upstart-jobs/pcmcia.nix + ../upstart-jobs/swap.nix + ../upstart-jobs/swraid.nix + ../upstart-jobs/tty-backgrounds.nix ]; } diff --git a/upstart-jobs/cron/locate.nix b/upstart-jobs/cron/locate.nix index bbb41f6e943..3e249007dc3 100644 --- a/upstart-jobs/cron/locate.nix +++ b/upstart-jobs/cron/locate.nix @@ -45,7 +45,7 @@ in { require = [ - ../../upstart-jobs/cron.nix # config.services.cron + # ../../upstart-jobs/cron.nix # config.services.cron options ]; diff --git a/upstart-jobs/httpd.nix b/upstart-jobs/httpd.nix deleted file mode 100644 index 1dd25afbf9c..00000000000 --- a/upstart-jobs/httpd.nix +++ /dev/null @@ -1,134 +0,0 @@ -{pkgs, config, ...}: - -###### interface -let - inherit (pkgs.lib) mkOption mkIf; - - # options have been moved to the apache-httpd/default.nix file - -in - -###### implementation - -let - - cfg = config.services.httpd; - cfgSvn = cfg.subservices.subversion; - - optional = pkgs.lib.optional; - - - documentRoot = cfg.documentRoot; - hostName = cfg.hostName; - httpPort = cfg.port; - httpsPort = 443; - user = cfg.user; - group = cfg.group; - adminAddr = cfg.adminAddr; - logDir = cfg.logDir; - stateDir = cfg.stateDir; - enableSSL = false; - applicationMappings = cfg.mod_jk.applicationMappings; - - startingDependency = if config.services.gw6c.enable && config.services.gw6c.autorun then "gw6c" else "network-interfaces"; - - - extraConfig = pkgs.lib.concatStringsSep "\n" - (pkgs.lib.catAttrs "extraHttpdConfig" config.services.extraJobs); - - - webServer = import ../../services/apache-httpd { - inherit (pkgs) apacheHttpd coreutils; - stdenv = pkgs.stdenv; - php = if cfg.mod_php then pkgs.php else null; - tomcat_connectors = if cfg.mod_jk.enable then pkgs.tomcat_connectors else null; - - inherit documentRoot hostName httpPort httpsPort - user group adminAddr logDir stateDir - applicationMappings; - noUserDir = !cfg.enableUserDir; - - extraDirectories = extraConfig + "\n" + cfg.extraConfig; - - subServices = - - # The Subversion subservice. - (optional cfgSvn.enable ( - let dataDir = cfgSvn.dataDir; in - import ../../services/subversion ({ - reposDir = dataDir + "/repos"; - dbDir = dataDir + "/db"; - distsDir = dataDir + "/dist"; - backupsDir = dataDir + "/backup"; - tmpDir = dataDir + "/tmp"; - - inherit user group logDir adminAddr; - - canonicalName = - if webServer.enableSSL then - "https://" + hostName + ":" + (toString httpsPort) - else - "http://" + hostName + ":" + (toString httpPort); - - notificationSender = cfgSvn.notificationSender; - autoVersioning = cfgSvn.autoVersioning; - userCreationDomain = cfgSvn.userCreationDomain; - - inherit pkgs; - } // - ( if cfgSvn.organization.name != null then - { - orgName = cfgSvn.organization.name; - orgLogoFile = cfgSvn.organization.logo; - orgUrl = cfgSvn.organization.url; - } - else - # use the default from the subversion service - {} - ) - ) - ) - ); - }; - -in - -mkIf (config.services.httpd.enable && !config.services.httpd.experimental) { - - require = [ - # options have been moved to the apache-httpd/default.nix file - ]; - - users = { - extraUsers = [ - { name = user; - description = "Apache httpd user"; - } - ]; - - extraGroups = [ - { name = group; - } - ]; - }; - - services = { - extraJobs = [{ - name = "httpd"; - - job = '' - description \"Apache HTTPD\" - - start on ${startingDependency}/started - stop on ${startingDependency}/stop - - start script - ${webServer}/bin/control prepare - end script - - respawn ${webServer}/bin/control run - ''; - - }]; - }; -}