commit 4bc9e8a785b9e8754ca533f64df30a040b195d30 · pyrox.dev/nixpkgs

+9 -4

nixos/modules/services/search/elasticsearch.nix

···

       9
       9
        
           network.host: ${cfg.listenAddress}

     

       10
       10
        
           network.port: ${toString cfg.port}

     

       11
       11
        
           network.tcp.port: ${toString cfg.tcp_port}

     

       12
       12
       +
           # TODO: find a way to enable security manager

     

       13
       13
       +
           security.manager.enabled: false

     

       12
       14
        
           cluster.name: ${cfg.cluster_name}

     

       13
       15
        
           ${cfg.extraConf}

     

       14
       16
        
         '';

     
···

       39
       41
        
       

     

       40
       42
        
           package = mkOption {

     

       41
       43
        
             description = "Elasticsearch package to use.";

     

       42
       42
       -
             default = pkgs.elasticsearch;

     

       43
       43
       -
             defaultText = "pkgs.elasticsearch";

     

       44
       44
       +
             default = pkgs.elasticsearch2;

     

       45
       45
       +
             defaultText = "pkgs.elasticsearch2";

     

       44
       46
        
             type = types.package;

     

       45
       47
        
           };

     

       46
       48
        
       

     
···

       129
       131
        
             wantedBy = [ "multi-user.target" ];

     

       130
       132
        
             after = [ "network-interfaces.target" ];

     

       131
       133
        
             path = [ pkgs.inetutils ];

     

       132
       132
       -
             environment = { ES_HOME = cfg.dataDir; };

     

       134
       134
       +
             environment = {

     

       135
       135
       +
               ES_HOME = cfg.dataDir;

     

       136
       136
       +
             };

     

       133
       137
        
             serviceConfig = {

     

       134
       138
        
               ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}";

     

       135
       139
        
               User = "elasticsearch";

     
···

       137
       141
        
             };

     

       138
       142
        
             preStart = ''

     

       139
       143
        
               mkdir -m 0700 -p ${cfg.dataDir}

     

       140
       140
       -
               if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi

     

       141
       144
        
       

     

       142
       145
        
               # Install plugins

     

       143
       146
        
               ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins

     

       147
       147
       +
               ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib

     

       148
       148
       +
               if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi

     

       144
       149
        
             '';

     

       145
       150
        
             postStart = mkBefore ''

     

       146
       151
        
               until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do

+41

pkgs/servers/search/elasticsearch/2.x.nix

···

       1
       1
       +
       { stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }:

     

       2
       2
       +
       

     

       3
       3
       +
       with stdenv.lib;

     

       4
       4
       +
       

     

       5
       5
       +
       stdenv.mkDerivation rec {

     

       6
       6
       +
         version = "2.2.0";

     

       7
       7
       +
         name = "elasticsearch-${version}";

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchurl {

     

       10
       10
       +
           url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz";

     

       11
       11
       +
           sha256 = "0c2d0mpcr8lpvifvgp2pfj7avdi7fa8a5vib0gqdap7mw60wqw7d";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         patches = [ ./es-home-2.x.patch ];

     

       15
       15
       +
       

     

       16
       16
       +
         buildInputs = [ makeWrapper jre ] ++

     

       17
       17
       +
           (if (!stdenv.isDarwin) then [utillinux] else [getopt]);

     

       18
       18
       +
       

     

       19
       19
       +
         installPhase = ''

     

       20
       20
       +
           mkdir -p $out

     

       21
       21
       +
           cp -R bin config lib $out

     

       22
       22
       +
       

     

       23
       23
       +
           # don't want to have binary with name plugin

     

       24
       24
       +
           mv $out/bin/plugin $out/bin/elasticsearch-plugin

     

       25
       25
       +
              wrapProgram $out/bin/elasticsearch ${if (!stdenv.isDarwin)

     

       26
       26
       +
               then ''--prefix PATH : "${utillinux}/bin/"''

     

       27
       27
       +
               else ''--prefix PATH : "${getopt}/bin"''} \

     

       28
       28
       +
             --set JAVA_HOME "${jre}"

     

       29
       29
       +
           wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}"

     

       30
       30
       +
         '';

     

       31
       31
       +
       

     

       32
       32
       +
         meta = {

     

       33
       33
       +
           description = "Open Source, Distributed, RESTful Search Engine";

     

       34
       34
       +
           license = licenses.asl20;

     

       35
       35
       +
           platforms = platforms.unix;

     

       36
       36
       +
           maintainers = [

     

       37
       37
       +
             maintainers.offline

     

       38
       38
       +
             maintainers.markWot

     

       39
       39
       +
           ];

     

       40
       40
       +
         };

     

       41
       41
       +
       }

+31

pkgs/servers/search/elasticsearch/es-home-2.x.patch

···

       1
       1
       +
       diff -rupN a/bin/elasticsearch b/bin/elasticsearch

     

       2
       2
       +
       --- a/bin/elasticsearch	2015-11-18 21:48:18.000000000 +0100

     

       3
       3
       +
       +++ b/bin/elasticsearch	2015-12-04 00:52:21.032475098 +0100

     

       4
       4
       +
       @@ -72,7 +72,11 @@ while [ -h "$SCRIPT" ] ; do

     

       5
       5
       +
        done

     

       6
       6
       +
        

     

       7
       7
       +
        # determine elasticsearch home

     

       8
       8
       +
       -ES_HOME=`dirname "$SCRIPT"`/..

     

       9
       9
       +
       +

     

       10
       10
       +
       +if [ -z "$ES_HOME" ]; then

     

       11
       11
       +
       +    echo "You must set the ES_HOME var" >&2

     

       12
       12
       +
       +    exit 1

     

       13
       13
       +
       +fi

     

       14
       14
       +
        

     

       15
       15
       +
        # make ELASTICSEARCH_HOME absolute

     

       16
       16
       +
        ES_HOME=`cd "$ES_HOME"; pwd`

     

       17
       17
       +
       diff -rupN a/bin/plugin b/bin/plugin

     

       18
       18
       +
       --- a/bin/plugin	2015-11-18 21:48:18.000000000 +0100

     

       19
       19
       +
       +++ b/bin/plugin	2015-12-04 00:52:55.947453619 +0100

     

       20
       20
       +
       @@ -17,7 +17,10 @@ while [ -h "$SCRIPT" ] ; do

     

       21
       21
       +
        done

     

       22
       22
       +
        

     

       23
       23
       +
        # determine elasticsearch home

     

       24
       24
       +
       -ES_HOME=`dirname "$SCRIPT"`/..

     

       25
       25
       +
       +if [ -z "$ES_HOME" ]; then

     

       26
       26
       +
       +    echo "You must set the ES_HOME var" >&2

     

       27
       27
       +
       +    exit 1

     

       28
       28
       +
       +fi

     

       29
       29
       +
        

     

       30
       30
       +
        # make ELASTICSEARCH_HOME absolute

     

       31
       31
       +
        ES_HOME=`cd "$ES_HOME"; pwd`

pkgs/top-level/all-packages.nix

···

       1437
       1437
        
         evemu = callPackage ../tools/system/evemu { };

     

       1438
       1438
        
       

     

       1439
       1439
        
         elasticsearch = callPackage ../servers/search/elasticsearch { };

     

       1440
       1440
       +
         elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };

     

       1440
       1441
        
       

     

       1441
       1442
        
         elasticsearchPlugins = recurseIntoAttrs (

     

       1442
       1443
        
           callPackage ../servers/search/elasticsearch/plugins.nix { }