commit a2b8cc0aaf74f4a98b820925f96a33123fbcd1c4 · pyrox.dev/nixpkgs

nixos/modules/module-list.nix

···

       275
       275
        
         ./services/monitoring/zabbix-agent.nix

     

       276
       276
        
         ./services/monitoring/zabbix-server.nix

     

       277
       277
        
         ./services/network-filesystems/drbd.nix

     

       278
       278
       +
         ./services/network-filesystems/netatalk.nix

     

       278
       279
        
         ./services/network-filesystems/nfsd.nix

     

       279
       280
        
         ./services/network-filesystems/openafs-client/default.nix

     

       280
       281
        
         ./services/network-filesystems/rsyncd.nix

+150

nixos/modules/services/network-filesystems/netatalk.nix

···

       1
       1
       +
       { config, pkgs, lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
       

     

       7
       7
       +
         cfg = config.services.netatalk;

     

       8
       8
       +
       

     

       9
       9
       +
         extmapFile = pkgs.writeText "extmap.conf" cfg.extmap;

     

       10
       10
       +
       

     

       11
       11
       +
         afpToString = x: if builtins.typeOf x == "bool"

     

       12
       12
       +
                          then (if x then "true" else "false")

     

       13
       13
       +
                          else toString x;

     

       14
       14
       +
       

     

       15
       15
       +
         volumeConfig = name:

     

       16
       16
       +
           let vol = getAttr name cfg.volumes; in

     

       17
       17
       +
           "[${name}]\n " + (toString (

     

       18
       18
       +
              map

     

       19
       19
       +
                (key: "${key} = ${afpToString (getAttr key vol)}\n")

     

       20
       20
       +
                (attrNames vol)

     

       21
       21
       +
           ));

     

       22
       22
       +
       

     

       23
       23
       +
         afpConf = ''[Global]

     

       24
       24
       +
           extmap file = ${extmapFile}

     

       25
       25
       +
           afp port = ${toString cfg.port}

     

       26
       26
       +
       

     

       27
       27
       +
           ${cfg.extraConfig}

     

       28
       28
       +
       

     

       29
       29
       +
           ${if cfg.homes.enable then ''[Homes]

     

       30
       30
       +
           ${optionalString (cfg.homes.path != "") "path = ${cfg.homes.path}"}

     

       31
       31
       +
           basedir regex = ${cfg.homes.basedirRegex}

     

       32
       32
       +
           ${cfg.homes.extraConfig}

     

       33
       33
       +
           '' else ""}

     

       34
       34
       +
       

     

       35
       35
       +
            ${toString (map volumeConfig (attrNames cfg.volumes))}

     

       36
       36
       +
         '';

     

       37
       37
       +
       

     

       38
       38
       +
         afpConfFile = pkgs.writeText "afp.conf" afpConf;

     

       39
       39
       +
       

     

       40
       40
       +
       in

     

       41
       41
       +
       

     

       42
       42
       +
       {

     

       43
       43
       +
         options = {

     

       44
       44
       +
           services.netatalk = {

     

       45
       45
       +
       

     

       46
       46
       +
             enable = mkOption {

     

       47
       47
       +
                 default = false;

     

       48
       48
       +
                 description = "Whether to enable the Netatalk AFP fileserver.";

     

       49
       49
       +
               };

     

       50
       50
       +
       

     

       51
       51
       +
             port = mkOption {

     

       52
       52
       +
               default = 548;

     

       53
       53
       +
               description = "TCP port to be used for AFP.";

     

       54
       54
       +
             };

     

       55
       55
       +
       

     

       56
       56
       +
             extraConfig = mkOption {

     

       57
       57
       +
               type = types.lines;

     

       58
       58
       +
               default = "";

     

       59
       59
       +
               example = "uam list = uams_guest.so";

     

       60
       60
       +
               description = ''

     

       61
       61
       +
                 Lines of configuration to add to the <literal>[Global]</literal> section.

     

       62
       62
       +
                 See <literal>man apf.conf</literal> for more information.

     

       63
       63
       +
               '';

     

       64
       64
       +
             };

     

       65
       65
       +
       

     

       66
       66
       +
             homes = {

     

       67
       67
       +
               enable = mkOption {

     

       68
       68
       +
                 default = false;

     

       69
       69
       +
                 description = "Enable sharing of the UNIX server user home directories.";

     

       70
       70
       +
               };

     

       71
       71
       +
       

     

       72
       72
       +
               path = mkOption {

     

       73
       73
       +
                 default = "";

     

       74
       74
       +
                 example = "afp-data";

     

       75
       75
       +
                 description = "Share not the whole user home but this subdirectory path.";

     

       76
       76
       +
               };

     

       77
       77
       +
       

     

       78
       78
       +
               basedirRegex = mkOption {

     

       79
       79
       +
                 example = "/home";

     

       80
       80
       +
                 description = "Regex which matches the parent directory of the user homes.";

     

       81
       81
       +
               };

     

       82
       82
       +
       

     

       83
       83
       +
               extraConfig = mkOption {

     

       84
       84
       +
                 type = types.lines;

     

       85
       85
       +
                 default = "";

     

       86
       86
       +
                 description = ''

     

       87
       87
       +
                   Lines of configuration to add to the <literal>[Homes]</literal> section.

     

       88
       88
       +
                   See <literal>man apf.conf</literal> for more information.

     

       89
       89
       +
                 '';

     

       90
       90
       +
                };

     

       91
       91
       +
             };

     

       92
       92
       +
       

     

       93
       93
       +
             volumes = mkOption {

     

       94
       94
       +
               default = { };

     

       95
       95
       +
               type = types.attrsOf (types.attrsOf types.unspecified);

     

       96
       96
       +
               description =

     

       97
       97
       +
                 ''

     

       98
       98
       +
                   Set of AFP volumes to export.

     

       99
       99
       +
                   See <literal>man apf.conf</literal> for more information.

     

       100
       100
       +
                 '';

     

       101
       101
       +
               example =

     

       102
       102
       +
                 { srv =

     

       103
       103
       +
                    { path = "/srv";

     

       104
       104
       +
                      "read only" = true;

     

       105
       105
       +
                      "hosts allow" = "10.1.0.0/16 10.2.1.100 2001:0db8:1234::/48";

     

       106
       106
       +
                    };

     

       107
       107
       +
                 };

     

       108
       108
       +
             };

     

       109
       109
       +
       

     

       110
       110
       +
             extmap = mkOption {

     

       111
       111
       +
               type = types.lines;

     

       112
       112
       +
       	default = "";

     

       113
       113
       +
       	description = ''

     

       114
       114
       +
       	  File name extension mappings.

     

       115
       115
       +
       	  See <literal>man extmap.conf</literal> for more information.

     

       116
       116
       +
               '';

     

       117
       117
       +
             };

     

       118
       118
       +
       

     

       119
       119
       +
           };

     

       120
       120
       +
         };

     

       121
       121
       +
       

     

       122
       122
       +
         config = mkIf cfg.enable {

     

       123
       123
       +
       

     

       124
       124
       +
           systemd.services.netatalk = {

     

       125
       125
       +
             description = "Netatalk AFP fileserver for Macintosh clients";

     

       126
       126
       +
             unitConfig.Documentation = "man:afp.conf(5) man:netatalk(8) man:afpd(8) man:cnid_metad(8) man:cnid_dbd(8)";

     

       127
       127
       +
             after = [ "network.target" "avahi-daemon.service" ];

     

       128
       128
       +
             wantedBy = [ "multi-user.target" ];

     

       129
       129
       +
       

     

       130
       130
       +
             path = [ pkgs.netatalk ];

     

       131
       131
       +
       

     

       132
       132
       +
             serviceConfig = {

     

       133
       133
       +
               Type = "forking";

     

       134
       134
       +
               GuessMainPID = "no";

     

       135
       135
       +
               PIDFile = "/run/lock/netatalk";

     

       136
       136
       +
       	ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID";

     

       137
       137
       +
               ExecStart  = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}";

     

       138
       138
       +
               ExecReload = "${pkgs.coreutils}/bin/kill -HUP  $MAINPID";

     

       139
       139
       +
       	ExecStop   = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";

     

       140
       140
       +
               Restart = "always";

     

       141
       141
       +
               RestartSec = 1;

     

       142
       142
       +
             };

     

       143
       143
       +
       

     

       144
       144
       +
           };

     

       145
       145
       +
       

     

       146
       146
       +
           security.pam.services.netatalk.unixAuth = true;

     

       147
       147
       +
       

     

       148
       148
       +
         };

     

       149
       149
       +
       

     

       150
       150
       +
       }

+10 -6

pkgs/tools/filesystems/netatalk/default.nix

···

       1
       1
       -
       { fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }:

     

       1
       1
       +
       { fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl, acl }:

     

       2
       2
        
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       4
       4
       -
         name = "netatalk-3.1.0";

     

       3
       3
       +
       stdenv.mkDerivation rec{

     

       4
       4
       +
         name = "netatalk-3.1.7";

     

       5
       5
        
       

     

       6
       6
        
         src = fetchurl {

     

       7
       7
        
           url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2";

     

       8
       8
       -
           sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";

     

       8
       8
       +
           sha256 = "0wf09fyqzza024qr1s26z5x7rsvh9zb4pv598gw7gm77wjcr6174";

     

       9
       9
        
         };

     

       10
       10
        
       

     

       11
       11
       -
         buildInputs = [ pkgconfig db libgcrypt avahi pam openssl libiconv ];

     

       11
       11
       +
         buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl acl ];

     

       12
       12
       +
       

     

       13
       13
       +
         patches = ./omitLocalstatedirCreation.patch;

     

       12
       14
        
       

     

       13
       15
        
         configureFlags = [

     

       14
       16
        
           "--with-bdb=${db}"

     

       15
       17
        
           "--with-openssl=${openssl}"

     

       18
       18
       +
           "--with-lockfile=/run/lock/netatalk"

     

       19
       19
       +
           "--localstatedir=/var/lib"

     

       16
       20
        
         ];

     

       17
       21
        
       

     

       18
       22
        
         enableParallelBuild = true;

     

       19
       23
        
       

     

       20
       24
        
         meta = {

     

       21
       21
       -
           description = "Apple File Protocl Server";

     

       25
       25
       +
           description = "Apple Filing Protocol Server";

     

       22
       26
        
           homepage = http://netatalk.sourceforge.net/;

     

       23
       27
        
           license = stdenv.lib.licenses.gpl3;

     

       24
       28
        
           platforms = stdenv.lib.platforms.linux;

+35

pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch

···

       1
       1
       +
       diff -ur netatalk-3.1.7-old/config/Makefile.in netatalk-3.1.7-new/config/Makefile.in 

     

       2
       2
       +
       --- netatalk-3.1.7-old/config/Makefile.in	2014-08-29 03:33:35.000000000 -0700

     

       3
       3
       +
       +++ netatalk-3.1.7-new/config/Makefile.in	2015-08-13 20:52:35.000000000 -0700

     

       4
       4
       +
       @@ -699,7 +699,7 @@

     

       5
       5
       +
        

     

       6
       6
       +
        info-am:

     

       7
       7
       +
        

     

       8
       8
       +
       -install-data-am: install-data-local install-dbusserviceDATA

     

       9
       9
       +
       +install-data-am: install-dbusserviceDATA

     

       10
       10
       +
        

     

       11
       11
       +
        install-dvi: install-dvi-recursive

     

       12
       12
       +
        

     

       13
       13
       +
       @@ -754,7 +754,7 @@

     

       14
       14
       +
        	cscopelist cscopelist-recursive ctags ctags-recursive \

     

       15
       15
       +
        	distclean distclean-generic distclean-libtool distclean-tags \

     

       16
       16
       +
        	distdir dvi dvi-am html html-am info info-am install \

     

       17
       17
       +
       -	install-am install-data install-data-am install-data-local \

     

       18
       18
       +
       +	install-am install-data install-data-am \

     

       19
       19
       +
        	install-dbusserviceDATA install-dvi install-dvi-am \

     

       20
       20
       +
        	install-exec install-exec-am install-html install-html-am \

     

       21
       21
       +
        	install-info install-info-am install-man install-pdf \

     

       22
       22
       +
       @@ -782,12 +782,6 @@

     

       23
       23
       +
        # install configuration files

     

       24
       24
       +
        #

     

       25
       25
       +
        

     

       26
       26
       +
       -install-data-local: install-config-files

     

       27
       27
       +
       -	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/

     

       28
       28
       +
       -	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/CNID/

     

       29
       29
       +
       -	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/

     

       30
       30
       +
       -	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/

     

       31
       31
       +
       -

     

       32
       32
       +
        uninstall-local:

     

       33
       33
       +
        	@for f in $(CONFFILES) $(GENFILES); do \

     

       34
       34
       +
        		echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \

     

       35
       35
       +