Merge pull request #1196 from bjornfor/capitalize-service-descriptions

nixos: capitalize a bunch of service descriptions
This commit is contained in:
Domen Kožar 2013-11-12 01:25:18 -08:00
commit cee0f6c708
10 changed files with 19 additions and 19 deletions

View File

@ -131,7 +131,7 @@ in {
users.extraGroups.pulse.gid = gid; users.extraGroups.pulse.gid = gid;
systemd.services.pulseaudio = { systemd.services.pulseaudio = {
description = "PulseAudio system-wide server"; description = "PulseAudio System-Wide Server";
wantedBy = [ "sound.target" ]; wantedBy = [ "sound.target" ];
before = [ "sound.target" ]; before = [ "sound.target" ];
path = [ cfg.package ]; path = [ cfg.package ];

View File

@ -161,7 +161,7 @@ in
''; '';
systemd.services.venus = systemd.services.venus =
{ description = "Planet Venus, an awesome river of news feed reader"; { description = "Planet Venus Feed Reader";
path = [ pkgs.venus ]; path = [ pkgs.venus ];
script = "exec venus-planet ${configFile}"; script = "exec venus-planet ${configFile}";
serviceConfig.User = "${cfg.user}"; serviceConfig.User = "${cfg.user}";

View File

@ -28,7 +28,7 @@ with pkgs.lib;
services.dbus.packages = [ pkgs.bluez ]; services.dbus.packages = [ pkgs.bluez ];
systemd.services."dbus-org.bluez" = { systemd.services."dbus-org.bluez" = {
description = "Bluetooth service"; description = "Bluetooth Service";
serviceConfig = { serviceConfig = {
Type = "dbus"; Type = "dbus";
BusName = "org.bluez"; BusName = "org.bluez";

View File

@ -148,7 +148,7 @@ in
# wall: cannot get tty name: Inappropriate ioctl for device # wall: cannot get tty name: Inappropriate ioctl for device
# The message still gets through. # The message still gets through.
systemd.services.apcupsd = { systemd.services.apcupsd = {
description = "APC UPS daemon"; description = "APC UPS Daemon";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
preStart = "mkdir -p /run/apcupsd/"; preStart = "mkdir -p /run/apcupsd/";
serviceConfig = { serviceConfig = {
@ -172,7 +172,7 @@ in
before = [ "final.target" ]; before = [ "final.target" ];
wantedBy = [ "shutdown.target" ]; wantedBy = [ "shutdown.target" ];
unitConfig = { unitConfig = {
Description = "APC UPS killpower"; Description = "APC UPS Kill Power";
ConditionPathExists = "/run/apcupsd/powerfail"; ConditionPathExists = "/run/apcupsd/powerfail";
DefaultDependencies = "no"; DefaultDependencies = "no";
}; };

View File

@ -172,7 +172,7 @@ in {
]; ];
systemd.services.carbonCache = mkIf cfg.carbon.enableCache { systemd.services.carbonCache = mkIf cfg.carbon.enableCache {
description = "Graphite data storage backend"; description = "Graphite Data Storage Backend";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-interfaces.target" ]; after = [ "network-interfaces.target" ];
environment = carbonEnv; environment = carbonEnv;
@ -190,7 +190,7 @@ in {
}; };
systemd.services.carbonAggregator = mkIf cfg.carbon.enableAggregator { systemd.services.carbonAggregator = mkIf cfg.carbon.enableAggregator {
description = "Carbon data aggregator"; description = "Carbon Data Aggregator";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-interfaces.target" ]; after = [ "network-interfaces.target" ];
environment = carbonEnv; environment = carbonEnv;
@ -201,7 +201,7 @@ in {
}; };
systemd.services.carbonRelay = mkIf cfg.carbon.enableRelay { systemd.services.carbonRelay = mkIf cfg.carbon.enableRelay {
description = "Carbon data relay"; description = "Carbon Data Relay";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-interfaces.target" ]; after = [ "network-interfaces.target" ];
environment = carbonEnv; environment = carbonEnv;
@ -212,7 +212,7 @@ in {
}; };
systemd.services.graphiteWeb = mkIf cfg.web.enable { systemd.services.graphiteWeb = mkIf cfg.web.enable {
description = "Graphite web interface"; description = "Graphite Web Interface";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network-interfaces.target" ]; after = [ "network-interfaces.target" ];
environment = { environment = {

View File

@ -182,7 +182,7 @@ in
}) (mkIf nodeCfg.enable { }) (mkIf nodeCfg.enable {
systemd.services.munin-node = { systemd.services.munin-node = {
description = "Munin node, the agent process"; description = "Munin Node";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ pkgs.munin ]; path = [ pkgs.munin ];

View File

@ -57,7 +57,7 @@ let
nssModulesPath = config.system.nssModules.path; nssModulesPath = config.system.nssModules.path;
daemonService = appName: args: daemonService = appName: args:
{ description = "Samba Service daemon ${appName}"; { description = "Samba Service Daemon ${appName}";
wantedBy = [ "samba.target" ]; wantedBy = [ "samba.target" ];
partOf = [ "samba.target" ]; partOf = [ "samba.target" ];
@ -211,7 +211,7 @@ in
systemd = { systemd = {
targets.samba = { targets.samba = {
description = "Samba server"; description = "Samba Server";
requires = [ "samba-setup.service" ]; requires = [ "samba-setup.service" ];
after = [ "samba-setup.service" "network.target" ]; after = [ "samba-setup.service" "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -222,7 +222,7 @@ in
"samba-smbd" = daemonService "smbd" "-F"; "samba-smbd" = daemonService "smbd" "-F";
"samba-winbindd" = daemonService "winbindd" "-F"; "samba-winbindd" = daemonService "winbindd" "-F";
"samba-setup" = { "samba-setup" = {
description = "Samba setup task"; description = "Samba Setup Task";
script = setupScript; script = setupScript;
unitConfig.RequiresMountsFor = "/home/smbd /var/samba /var/log/samba"; unitConfig.RequiresMountsFor = "/home/smbd /var/samba /var/log/samba";
}; };

View File

@ -76,7 +76,7 @@ in
}; };
systemd.services."zfs-mount" = { systemd.services."zfs-mount" = {
description = "Mount zfs volumes"; description = "Mount ZFS Volumes";
after = [ "zpool-import.service" ]; after = [ "zpool-import.service" ];
wantedBy = [ "local-fs.target" ]; wantedBy = [ "local-fs.target" ];
serviceConfig = { serviceConfig = {

View File

@ -113,7 +113,7 @@ in
jobs.nova_objectstore = jobs.nova_objectstore =
{ name = "nova-objectstore"; { name = "nova-objectstore";
description = "Nova simple object store service"; description = "Nova Simple Object Store Service";
startOn = "ip-up"; startOn = "ip-up";
@ -129,7 +129,7 @@ in
jobs.nova_scheduler = jobs.nova_scheduler =
{ name = "nova-scheduler"; { name = "nova-scheduler";
description = "Nova scheduler service"; description = "Nova Scheduler Service";
startOn = "ip-up"; startOn = "ip-up";
@ -140,7 +140,7 @@ in
jobs.nova_compute = jobs.nova_compute =
{ name = "nova-compute"; { name = "nova-compute";
description = "Nova compute service"; description = "Nova Compute Service";
startOn = "ip-up"; startOn = "ip-up";
@ -157,7 +157,7 @@ in
jobs.nova_network = jobs.nova_network =
{ name = "nova-network"; { name = "nova-network";
description = "Nova network service"; description = "Nova Network Service";
startOn = "ip-up"; startOn = "ip-up";

View File

@ -107,7 +107,7 @@ in
''; '';
jobs.xend = jobs.xend =
{ description = "Xen control daemon"; { description = "Xen Control Daemon";
startOn = "stopped udevtrigger"; startOn = "stopped udevtrigger";