diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2015-08-21 16:18:09 -0400 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2015-08-22 14:05:35 -0400 |
| commit | 648973d6419992c28322954ad0205cb05ef87997 (patch) | |
| tree | d1fa2409226db81db431062cf7b49fa932e277b9 | |
| parent | 1be2b63d2704e82c9f2188b070b62aa0a8c36404 (diff) | |
| download | nixpkgs-648973d6419992c28322954ad0205cb05ef87997.tar nixpkgs-648973d6419992c28322954ad0205cb05ef87997.tar.gz nixpkgs-648973d6419992c28322954ad0205cb05ef87997.tar.bz2 nixpkgs-648973d6419992c28322954ad0205cb05ef87997.tar.lz nixpkgs-648973d6419992c28322954ad0205cb05ef87997.tar.xz nixpkgs-648973d6419992c28322954ad0205cb05ef87997.tar.zst nixpkgs-648973d6419992c28322954ad0205cb05ef87997.zip | |
nixos: rename service 'ubuntu-fan' as 'fan'
| -rw-r--r-- | nixos/modules/module-list.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/networking/fan.nix (renamed from nixos/modules/services/networking/ubuntu-fan.nix) | 14 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/fanctl/default.nix | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 60255914d5d..ebfe5afe52f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -279,6 +279,7 @@ ./services/networking/dnsmasq.nix ./services/networking/docker-registry-server.nix ./services/networking/ejabberd.nix + ./services/networking/fan.nix ./services/networking/firefox/sync-server.nix ./services/networking/firewall.nix ./services/networking/flashpolicyd.nix @@ -344,7 +345,6 @@ ./services/networking/tlsdated.nix ./services/networking/tox-bootstrapd.nix ./services/networking/tvheadend.nix - ./services/networking/ubuntu-fan.nix ./services/networking/unbound.nix ./services/networking/unifi.nix ./services/networking/vsftpd.nix diff --git a/nixos/modules/services/networking/ubuntu-fan.nix b/nixos/modules/services/networking/fan.nix index 2759a671b81..3170567e5b4 100644 --- a/nixos/modules/services/networking/ubuntu-fan.nix +++ b/nixos/modules/services/networking/fan.nix @@ -4,7 +4,7 @@ with lib; let - cfg = config.networking.ubuntu-fan; + cfg = config.networking.fan; modprobe = "${config.system.sbin.modprobe}/sbin/modprobe"; in @@ -15,9 +15,9 @@ in options = { - networking.ubuntu-fan = { + networking.fan = { - enable = mkEnableOption "Ubuntu FAN Networking"; + enable = mkEnableOption "FAN Networking"; }; @@ -30,8 +30,8 @@ in environment.systemPackages = [ pkgs.fanctl ]; - systemd.services.ubuntu-fan = { - description = "Ubuntu FAN Networking"; + systemd.services.fan = { + description = "FAN Networking"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; before = [ "docker.service" ]; @@ -40,12 +40,12 @@ in if [ ! -f /proc/sys/net/fan/version ]; then ${modprobe} ipip if [ ! -f /proc/sys/net/fan/version ]; then - echo "The Ubuntu Fan Networking patches have not been applied to this kernel!" 1>&2 + echo "The Fan Networking patches have not been applied to this kernel!" 1>&2 exit 1 fi fi - mkdir -p /var/lib/ubuntu-fan + mkdir -p /var/lib/fan-networking ''; serviceConfig = { Type = "oneshot"; diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix index f0b863e0148..1d6e5e744cd 100644 --- a/pkgs/os-specific/linux/fanctl/default.nix +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # if that files does not exist, dnsmasq subsequently fails, # so we'll use /dev/null. # - # Also, make sure /var/lib/ubuntu-fan exists before starting dnsmasq. + # Also, make sure /var/lib/fan-networking exists before starting dnsmasq. buildPhase = '' substituteInPlace fanctl \ --replace '--conf-file= ' \ @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { '/var/lib/ubuntu-fan' sed -i '/dnsmasq -u/i \ - mkdir -p /var/lib/ubuntu-fan' fanctl + mkdir -p /var/lib/fan-networking' fanctl ''; installPhase = '' |