Systemd upstream provides targets for networking. This also includes a target network-online.target. In this PR I remove / replace most occurrences since some of them were even wrong and could delay startup.
		
			
				
	
	
		
			77 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			Nix
		
	
	
	
	
	
			
		
		
	
	
			77 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			Nix
		
	
	
	
	
	
{ config, lib, pkgs, ... }:
 | 
						|
 | 
						|
with lib;
 | 
						|
 | 
						|
let
 | 
						|
  cfg = config.services.amule;
 | 
						|
  user = if cfg.user != null then cfg.user else "amule";
 | 
						|
in
 | 
						|
 | 
						|
{
 | 
						|
 | 
						|
  ###### interface
 | 
						|
 | 
						|
  options = {
 | 
						|
 | 
						|
    services.amule = {
 | 
						|
 | 
						|
      enable = mkOption {
 | 
						|
        default = false;
 | 
						|
        description = ''
 | 
						|
          Whether to run the AMule daemon. You need to manually run "amuled --ec-config" to configure the service for the first time.
 | 
						|
        '';
 | 
						|
      };
 | 
						|
 | 
						|
      dataDir = mkOption {
 | 
						|
        default = ''/home/${user}/'';
 | 
						|
        description = ''
 | 
						|
          The directory holding configuration, incoming and temporary files.
 | 
						|
        '';
 | 
						|
      };
 | 
						|
 | 
						|
      user = mkOption {
 | 
						|
        default = null;
 | 
						|
        description = ''
 | 
						|
          The user the AMule daemon should run as.
 | 
						|
        '';
 | 
						|
      };
 | 
						|
 | 
						|
    };
 | 
						|
 | 
						|
  };
 | 
						|
 | 
						|
 | 
						|
  ###### implementation
 | 
						|
 | 
						|
  config = mkIf cfg.enable {
 | 
						|
 | 
						|
    users.extraUsers = mkIf (cfg.user == null) [
 | 
						|
      { name = "amule";
 | 
						|
        description = "AMule daemon";
 | 
						|
        group = "amule";
 | 
						|
        uid = config.ids.uids.amule;
 | 
						|
      } ];
 | 
						|
 | 
						|
    users.extraGroups = mkIf (cfg.user == null) [
 | 
						|
      { name = "amule";
 | 
						|
        gid = config.ids.gids.amule;
 | 
						|
      } ];
 | 
						|
 | 
						|
    systemd.services.amuled = {
 | 
						|
      description = "AMule daemon";
 | 
						|
      wantedBy = [ "multi-user.target" ];
 | 
						|
      after = [ "network.target" ];
 | 
						|
 | 
						|
      preStart = ''
 | 
						|
        mkdir -p ${cfg.dataDir}
 | 
						|
        chown ${user} ${cfg.dataDir}
 | 
						|
      '';
 | 
						|
 | 
						|
      script = ''
 | 
						|
        ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \
 | 
						|
            -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled'
 | 
						|
      '';
 | 
						|
    };
 | 
						|
  };
 | 
						|
}
 |