treewide: minor format / style / documentation fixes

This commit is contained in:
Alexander Ried 2016-09-08 22:19:43 +02:00
parent bc7710468d
commit 3ada966bd5
4 changed files with 5 additions and 5 deletions

View File

@ -145,7 +145,7 @@ in
}; };
systemd.services.bind = { systemd.services.bind = {
description = "BIND name server job"; description = "BIND Domain Name Server";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -155,6 +155,7 @@ in
''; '';
script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
unitConfig.Documentation = "man:named(8)";
}; };
}; };
} }

View File

@ -208,7 +208,7 @@ in
# networking.firewall.allowedUDPPorts = ... # networking.firewall.allowedUDPPorts = ...
systemd.services.cjdns = { systemd.services.cjdns = {
description = "encrypted networking for everybody"; description = "cjdns: routing engine designed for security, scalability, speed and ease of use";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "network.target" ]; after = [ "network.target" ];

View File

@ -244,7 +244,6 @@ in
chown ${serverInfo.serverConfig.user} ${config.wordpressUploads} chown ${serverInfo.serverConfig.user} ${config.wordpressUploads}
# we should use systemd dependencies here # we should use systemd dependencies here
#waitForUnit("network-interfaces.target");
if [ ! -d ${serverInfo.fullConfig.services.mysql.dataDir}/${config.dbName} ]; then if [ ! -d ${serverInfo.fullConfig.services.mysql.dataDir}/${config.dbName} ]; then
echo "Need to create the database '${config.dbName}' and grant permissions to user named '${config.dbUser}'." echo "Need to create the database '${config.dbName}' and grant permissions to user named '${config.dbUser}'."
# Wait until MySQL is up # Wait until MySQL is up